diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-03-30 22:10:17 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-03-30 22:10:17 +0200 |
| commit | 2b6325cacb6def8e9de0455f575b51a8bd90b12c (patch) | |
| tree | 9975f34681673f4ce96537ea6684ff0fa8f5df89 /configure | |
| parent | 96df29c318ff64cb6ac706c11cbf932d96962fd7 (diff) | |
| parent | b691fd7a4dfca766075c022922a75cdbca4e6d92 (diff) | |
| download | ffmpeg-2b6325cacb6def8e9de0455f575b51a8bd90b12c.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
h264: drop ff_h264_ prefix from static function ff_h264_decode_rbsp_trailing()
h264: Make ff_h264_decode_end() static, it is not used externally.
output-example: K&R formatting cosmetics, comment spelling fixes
avf: make the example output the proper message
avf: fix audio writing in the output-example
mov: don't overwrite existing indexes.
lzw: fix potential integer overflow.
truemotion: forbid invalid VLC bitsizes and token values.
truemotion2: handle out-of-frame motion vectors through edge extension.
configure: Check for a different SDL function
Conflicts:
configure
doc/examples/muxing.c
libavcodec/truemotion2.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -3219,7 +3219,7 @@ if enabled libdc1394; then fi SDL_CONFIG="${cross_prefix}sdl-config" -if check_pkg_config sdl SDL_version.h SDL_Linked_Version; then +if check_pkg_config sdl SDL_events.h SDL_PollEvent; then check_cpp_condition SDL.h "(SDL_MAJOR_VERSION<<16 | SDL_MINOR_VERSION<<8 | SDL_PATCHLEVEL) >= 0x010201" $sdl_cflags && enable sdl && check_struct SDL.h SDL_VideoInfo current_w $sdl_cflags && enable sdl_video_size |