Commit ID 4a58fd4be4444b8195c438ccc6445ced5c2e532d
|
|
Contributor: | Sebastian Dröge | Files Modified: | 13 |
| Date: | 14-June-2012 at 10:41 | Lines Added: | 3221 | |
| Repository: | git://anongit.freedesktop.org/gstreamer/gst-ffmpeg master | Lines Removed: | 2866 | |
| Commit Comment: | Merge remote-tracking branch 'origin/0.10' Conflicts: common ext/ffmpeg/Makefile.am ext/ffmpeg/gstffmpegcfg.c ext/ffmpeg/gstffmpegcodecmap.c ext/ffmpeg/gstffmpegcodecmap.h ext/ffmpeg/gstffmpegdec.c ext/ffmpeg/gstffmpegenc.c ext/ffmpeg/gstffmpegenc.h tests/check/Makefile.am Porting of the new video elements to 0.11 still pending. |
|||
| File | Language | Code Added | Code Removed | Comments Added | Comment Removed | Blanks Added | Blanks Removed |
|---|---|---|---|---|---|---|---|
| ext/ffmpeg/gstffmpeg.c | C | 4 | 2 | 0 | 0 | 0 | 0 |
| ext/ffmpeg/gstffmpegcfg.c | C | 13 | 12 | 0 | 0 | 0 | 0 |
| ext/ffmpeg/gstffmpegcfg.h | C | 4 | 4 | 0 | 0 | 0 | 0 |
| ext/ffmpeg/gstffmpegcodecmap.c | C | 65 | 0 | 44 | 0 | 13 | 0 |
| ext/ffmpeg/gstffmpegcodecmap.h | C | 5 | 0 | 0 | 0 | 2 | 0 |
| ext/ffmpeg/gstffmpegdec.c | C | 142 | 1482 | 4 | 214 | 0 | 255 |
| ext/ffmpeg/gstffmpegenc.c | C | 196 | 712 | 3 | 53 | 0 | 90 |
| ext/ffmpeg/gstffmpegenc.h | C | 17 | 32 | 0 | 3 | 0 | 5 |
| ext/ffmpeg/gstffmpeg.h | C | 4 | 2 | 0 | 0 | 0 | 0 |
| ext/ffmpeg/gstffmpegviddec.c | C | 1163 | 0 | 185 | 0 | 272 | 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.