diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-12 18:48:26 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-12 18:48:26 +0400 |
| commit | af7dd79a323090b14a7fb9ef24a3f6a24dc6d2db (patch) | |
| tree | ca68b14693edd87a495f00e759f06d5eafe0eafb /libavfilter/vf_delogo.c | |
| parent | 3d179edf6d2a987e7eb134eea541954338a19add (diff) | |
| parent | 50ba57e0ce63d9904269ea0728936a0c79f8bfb5 (diff) | |
Merge commit '50ba57e0ce63d9904269ea0728936a0c79f8bfb5'
* commit '50ba57e0ce63d9904269ea0728936a0c79f8bfb5':
lavc: do not use av_pix_fmt_descriptors directly.
Conflicts:
libavcodec/imgconvert.c
libavcodec/libopenjpegdec.c
libavcodec/libopenjpegenc.c
libavcodec/mpegvideo.c
libavcodec/rawdec.c
libavcodec/rawenc.c
libavcodec/tiffenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vf_delogo.c')
0 files changed, 0 insertions, 0 deletions