diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-05-03 04:08:23 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-05-03 04:08:23 +0200 |
| commit | 2525821f1aadf34e3c874c669feb6be27249e881 (patch) | |
| tree | 8ffda470556c8e38c09e0bd2ad4fd969b1e2cb33 /libavcodec/nellymoserenc.c | |
| parent | 7d70d1937a5c1a3fda8b988e3bccbb4a04ff3ae7 (diff) | |
| parent | 4773d904211ec07688418eb9bb78df6467c1ca2f (diff) | |
| download | ffmpeg-2525821f1aadf34e3c874c669feb6be27249e881.tar.gz | |
Merge remote branch 'qatar/master'
* qatar/master:
vp8: frame-multithreading.
Duplicate Replace deprecated FF_*_TYPE symbols with AV_PICTURE_TYPE_*.
Duplicate Replace deprecated av_get_pict_type_char() with av_get_picture_type_char().
Bug spoted&removed in last merge: dpx: Do not use DPX encoder for decoding.
Conflicts:
ffmpeg.c
ffplay.c
libavcodec/h264.c
libavcodec/mpeg12.c
libavcodec/mpeg4videodec.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo_enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/nellymoserenc.c')
0 files changed, 0 insertions, 0 deletions