diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-03-25 02:37:37 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-03-25 02:51:20 +0100 |
| commit | 5d6c5dd36c024784a9cd36391c3698c2f1f2d2ab (patch) | |
| tree | 38a5e809995dab9ee4232c3cb38063d6539b19a7 /libavcodec/resample.c | |
| parent | 3eb9e571dc8ddfc9d1ae99c2ee75f607181819c7 (diff) | |
| download | ffmpeg-5d6c5dd36c024784a9cd36391c3698c2f1f2d2ab.tar.gz | |
Merge remote-tracking branch 'ffmpeg-mt/master'
* ffmpeg-mt/master:
Update todo.
Draw edges in MPV_frame_end when encoding
Conflicts:
libavcodec/mpegvideo.c
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/resample.c')
0 files changed, 0 insertions, 0 deletions