diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-08-17 14:23:20 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-08-17 14:23:20 +0200 |
| commit | 27fbe31c921f49078764a69ccb701dbb767c7410 (patch) | |
| tree | 5a80541540a0a72063c3fa854febb77afc6518b7 /libavcodec/msrle.c | |
| parent | d071df888d5896031380b2b1733bd0cec833c3b6 (diff) | |
| parent | 6cd9d0f77d527491d0c3626f16b8e125a8a9344b (diff) | |
| download | ffmpeg-27fbe31c921f49078764a69ccb701dbb767c7410.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
Revert "avconv: use stream copy by default when possible."
avconv: print stream copy information.
avconv: use stream copy by default when possible.
matroskaenc: vertical alignment.
matroskaenc: implement query_codec()
lavf: add avformat_query_codec().
lavc: add avcodec_get_type() for mapping codec_id -> type.
flvenc: use int64_t to store offsets
avconv: don't segfault on 0 input files.
Do not write ID3v1 tags by default
mpegts: log into an AVFormatContext rather than MpegTSContext.
Conflicts:
doc/APIchanges
libavcodec/version.h
libavformat/avformat.h
libavformat/mp3enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/msrle.c')
0 files changed, 0 insertions, 0 deletions