diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-04-01 23:48:36 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-04-02 00:17:02 +0200 |
| commit | 49891784ce70456305f19847d4188f07bbc1b6e1 (patch) | |
| tree | ea5bd40d34743197c8cd4329ba223a8ba49118b3 /libavcodec/mpegvideo_enc.c | |
| parent | 178f75a5aeb3606bb7947e08f0b89826f5e31f85 (diff) | |
| parent | 95587d29d73c5cdf39062fde3f21436f8abf3e79 (diff) | |
| download | ffmpeg-49891784ce70456305f19847d4188f07bbc1b6e1.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
vsrc_buffer: allow buffering arbitrary number of frames.
vf_scale: avoid a pointless memcpy in no-op conversion.
avfiltergraph: try to reduce format conversions in filters.
avfiltergraph: add an AVClass to AVFilterGraph on next major bump.
id3v2: fix skipping extended header in id3v2.4
Conflicts:
libavfilter/vf_scale.c
libavfilter/vsrc_buffer.c
libavformat/id3v2.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpegvideo_enc.c')
0 files changed, 0 insertions, 0 deletions