Commits : Individual Commit
Analyzed about 21 hours
ago based on code collected about 21 hours ago.
Commit ID 967facb6950549d0cc4e0ba79a056ebc6f93a049
|
Contributor: | Michael Niedermayer | Files Modified: | 48 |
| Date: | 21-March-2012 at 22:47 | Lines Added: | 1073 | |
| Repository: | git://git.videolan.org/ffmpeg.git master | Lines Removed: | 358 | |
| Commit Comment: | Merge remote-tracking branch 'qatar/master' * qatar/master: (26 commits) adxenc: use AVCodec.encode2() adxenc: Use the AVFrame in ADXContext for coded_frame indeo4: fix out-of-bounds function call. configure: Restructure help output. configure: Internal-only components should not be command-line selectable. vorbisenc: use AVCodec.encode2() libvorbis: use AVCodec.encode2() libopencore-amrnbenc: use AVCodec.encode2() ra144enc: use AVCodec.encode2() nellymoserenc: use AVCodec.encode2() roqaudioenc: use AVCodec.encode2() libspeex: use AVCodec.encode2() libvo_amrwbenc: use AVCodec.encode2() libvo_aacenc: use AVCodec.encode2() wmaenc: use AVCodec.encode2() mpegaudioenc: use AVCodec.encode2() libmp3lame: use AVCodec.encode2() libgsmenc: use AVCodec.encode2() libfaac: use AVCodec.encode2() g726enc: use AVCodec.encode2() ... Conflicts: configure libavcodec/Makefile libavcodec/ac3enc.c libavcodec/adxenc.c libavcodec/libgsm.c libavcodec/libvorbis.c libavcodec/vorbisenc.c libavcodec/wmaenc.c tests/ref/acodec/g722 tests/ref/lavf/asf tests/ref/lavf/ffm tests/ref/lavf/mkv tests/ref/lavf/mpg tests/ref/lavf/rm tests/ref/lavf/ts tests/ref/seek/lavf_asf tests/ref/seek/lavf_ffm tests/ref/seek/lavf_mkv tests/ref/seek/lavf_mpg tests/ref/seek/lavf_rm tests/ref/seek/lavf_ts Merged-by: Michael Niedermayer <micha...@gmx.at> |
|||
Changes by Language
Changes by File
Showing page 1 of 5
| File | Language | Code Added | Code Removed | Comments Added | Comment Removed | Blanks Added | Blanks Removed |
|---|---|---|---|---|---|---|---|
| configure | Autoconf | 48 | 48 | 0 | 0 | 5 | 0 |
| libavcodec/aacenc.c | C | 38 | 13 | 1 | 0 | 5 | 0 |
| libavcodec/aacenc.h | C | 2 | 0 | 0 | 0 | 0 | 1 |
| libavcodec/ac3enc.c | C | 8 | 1 | 0 | 0 | 0 | 0 |
| libavcodec/ac3enc_fixed.c | C | 2 | 1 | 0 | 0 | 0 | 0 |
| libavcodec/ac3enc_float.c | C | 2 | 1 | 0 | 0 | 0 | 0 |
| libavcodec/ac3enc.h | C | 4 | 4 | 0 | 0 | 0 | 0 |
| libavcodec/ac3enc_template.c | C | 12 | 5 | 0 | 0 | 1 | 0 |
| libavcodec/adpcmenc.c | C | 29 | 16 | 0 | 1 | 2 | 0 |
| libavcodec/adxenc.c | C | 18 | 21 | 0 | 0 | 0 | 0 |
Copyright
©
2013
Black Duck Software, Inc.
and its contributors, Some Rights Reserved. Unless otherwise marked, this work is licensed under a
Creative Commons Attribution 3.0 Unported License
. Ohloh
®
and the Ohloh logo are trademarks of
Black Duck Software, Inc.
in the United States and/or other jurisdictions. All other trademarks are the property of their respective holders.