aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/svq1_cb.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-10-02 19:43:01 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-10-02 19:48:54 +0200
commit032ba74ed29e0af77da04d2305b0470cb42b1955 (patch)
tree45127c399bf7846d057b07d35d02cf3f6a5f8675 /libavcodec/svq1_cb.h
parentdd78e1090b4cae3fbaa71e266c4b6b2f82ea9b7c (diff)
parent7bda4ed780c23c4bd50cf9ccd91f235e67ab0eae (diff)
downloadffmpeg-032ba74ed29e0af77da04d2305b0470cb42b1955.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: ARM: fix Thumb PIC on Apple nut: add do {} while (0) to GET_V tiffenc: Check av_malloc() results. tiffenc: Simplify pixel format setup using AVPixFmtDescriptor. Use atexit() instead of defining a custom exit_program() interface. msvc: Fix detection of VFW & Avisynth required libs Conflicts: ffmpeg.c ffmpeg_opt.c ffplay.c ffprobe.c ffserver.c libavcodec/tiffenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/svq1_cb.h')
0 files changed, 0 insertions, 0 deletions