Squashed 'captive/ffmpeg/csrc/' changes from 6f9803e..40b7a27

40b7a27 vf_drawtext: fontconfig support.
be9b0d2 vf_drawtext: fix memory leak of draw expression.
423047e vf_drawtext: fix memory leak of glyph data.
24ab1ab resample: support double precission resampling
3d9338b swr: support int32 and float as internal sample formats
7f1ae79 swr: support float & int32 in the resampler
605bcf6 swr-test: Add newline to test output
2f08015 resample: update copyright years, they where incorrect.
6bfb304 Merge remote-tracking branch 'qatar/master'
7f66912 Fix gif regression test on big-endian.
3532a87 exr: optimize exr_halflt2uint()
cabc0ac Add gif and xbm regression tests.
6458a08 vf_scale: ensure the palette is set for output.
24eac3c Mark GRAY8 format as pseudo-paletted.
bbaf941 scale: fix slice rendering with conversion between pal/non-pal.
438f3ef RV20: try keeping aspect during resolution changes.
1d13032 aacdec: update debug code to always print the processed data.
679a973 avconv: use default alignment for audio buffer
c58846f avcodec: use align == 0 for default alignment in avcodec_fill_audio_frame()
0109a09 avutil: use align == 0 for default alignment in audio sample buffer functions
18ed378 avutil: allow NULL linesize in av_samples_fill_arrays() and av_samples_alloc()
b6c4518 avconv: remove OutputStream.picref.
695ec04 avconv: only set SAR once on the decoded frame.
ed68fd4 Add v408 codec regression test.
1337de0 avcodec: validate the channel layout vs. channel count for decoders
b2db359 audioconvert: make av_get_channel_layout accept composite names.
c311afc Add roqaudio regression test.
4d693b0 avutil: add av_get_packed_sample_fmt() and av_get_planar_sample_fmt()
5d6a40b Merge remote-tracking branch 'qatar/master'
4f043c8 Allow running fate-wmv8-x8intra manually.
a5efc8c Allow manually running disabled FATE tests.
03ef504 Fix nellymoser encoder crash with hardcoded tables.
a7b1420 Update reference for disabled fate-wmv8-x8intra test to new format.
1d80c8d ffv1: set slice geometry based on user specified slices.
8dfbc1c ffv1: allow enabling of version 2 by using some of its features.
1b295a1 ffv1: fix version=2 chroma handling
5612359 ffv1: add a minor version field beginning with ffv1.3
9294f53 rtsp: Don't use av_malloc(0) if there are no streams
62c3c8c rtsp: Don't use uninitialized data if there are no streams
069cf86 Fix side-data memleak also for audio.
58e1032 vaapi: mpeg2: fix slice_vertical_position calculation.
9cb150c hwaccel: mpeg2: decode first field, if requested.
2ce7f4d cosmetics: Fix indentation
4560014 rtsp: Don't expose the MS-RTSP RTX data stream to the caller
cb93946 mpegtsenc: Add support to mux s302 stream
352a67e configure: fix - vs _ error
58c2572 Add nellymoser "fuzzy" FATE test.
e984150 Allow setting CODEC_FLAG2_CHUNKS via the name "chunks".
d506ef0 Fixes for third argument do_image_formats.
f0bb1a5 ffprobe: use avbprint API
6101e53 Merge remote-tracking branch 'qatar/master'
5012c07 Support detecting and demuxing EIA-608 subtitles in mov.
50ec8a2 mpeg4videodec: Force quant_precision to stay within the valid range.
59edf33 wmalosslessdec: rawpcm_tile fixes to keep get_bits() values within defined range.
d0212bb wmalosslessdec: channel residues can be 32 bit thus need _long bitreader.
a931d87 mpeg12dec: Prevent f_code from becoming invalid.
6c3d6a2 alsdec: Check k used for rice decoder.
192efcf h264_ps: check log2_max_frame_num for validity.
2d0b4bc rv34: Fix check_slice_end() handling of 0 bits left case
6c24939 mpeg4videodec: make sure f/b_code are not invalid values.
6560fa3 get_bits: check the number of bits parameter through av_assert2()
2067671 vc1: fix incorrect show_bits() usage.
d3b0fb1 put_bits: add av_assert2() to check out of array writes.
e80ce4a Do not decode the mp3 data in lavf test since that is not bit-exact.
4395c05 dcaenc: Allow encoding without specifying a channel_layout.
82ca1f8 Test mp3 container muxing (and thus ID3 writing).
cb25a18 Fix DCA regression test to work across architectures.
815d8f8 doc/muxers: add documentation for the md5 and framemd5 muxers
60e4e43 doc/muxers: clarify documentation for the framecrc muxer
fd00662 doc/muxers: update documentation for the framecrc muxer
32b1022 doc/filters: remove reference to removed delogo wrapper
6cb01c9 lavfi/mp: remove remove_logo wrapper
2f83681 lavfi: port libmpcodecs remove-logo filter
087b9c3 fate: try to force le for the dpx decoder side too
6d3166f Add AAC FATE encode tests.
10e3dd1 Remove AAC and nellymoser tests that do not work.
796097c Add tests for audio encoders: aac, dca, ra144 and nellymoser.
ecd7455 aacenc: Fix issues with huge values of bit_rate.
76e8b33 proresenc_kostya: Mention likely ancestry in the license header.
d40132d proresenc_kostya: fix encoded mantissa.
dd7d08e proresenc_anatoly: fix encoded mantissa.
e3b7079 adpcmenc: fix encoded s_0 value.
fe5b7db build system: support setting avassert() assert_level
ab55361 put_bits: switch assert to av_assert2()
3fb945a mpegpsenc: fix user specified mux rate
b717f35 fate: try to fix >8bit dpx reg test
d293e34 rtpdec_asf: Set the no_resync_search option for the chained asf demuxer
75b7fea asfdec: Add an option for not searching for the packet markers
1428527 cosmetics: Clean up the tiffenc pix_fmts declaration to match the style of others
2e0c360 Merge remote-tracking branch 'qatar/master'
00c3b67 cosmetics: Align codec declarations
bd128e9 exr: fix mixed declaration and statements.
6d27d8b cosmetics: Convert mimic.c to utf-8
d493654 avconv: remove an unused function parameter.
4648fe6 avconv: remove now pointless variables.
e06d2df avconv: drop support for building without libavfilter.
cbb7183 tiny_psnr: allow searching for optimal shift value.
439c3d5 nellymoserenc: fix crash due to memsetting the wrong area.
ba24f12 libavformat: Only require first packet to be known for audio/video streams
50361e5 Add regression test for mov rtp hinting.
099a187 dpxenc: also test 10 and 16 bit formats.
e8b1da0 nellymoserenc: fix crash due to memsetting the wrong area.
951e715 avplay: Don't try to scale timestamps if the tb isn't set
20234a4 cosmetics: Align muxer/demuxer declarations
fdf3a74 mpeg12: Do not change frame_pred_frame_dct flag and demote error into a warning
f363773 doc: image2: update docs for glob input patterns
735fb8c ffmpeg: remove unused MetadataMap.
e5df74d ffmpeg: remove unused meta_data_maps.
e0f30a5 s302m: Add Channle Layout for 6 channels
25eae29 vsrc_buffer: remove overwrite support.
3826d53 README: be a tiny bit more verbose
f148537 exr: various cleanup and security related fixes
634c01b exr: fix av_logs()
b7ce324 lavc: add a OpenEXR decoder
9e91a7d fix fate tests after 76c79aa28fc8cf0bfe52915317a3cfc72383d0ef
e636aa1 movdec: handle 0x7fff langcode as macintosh per the specs
76c79aa Support yuva444p rawvideo in nut.
bb0618e avcodec: remove avcodec_guess_channel_layout()
5cc51a5 avutil: Add av_get_default_channel_layout()
2c5a295 Merge remote-tracking branch 'qatar/master'
3e4b5e6 cmdutils: fix -fdebug without -v xy
614716f mov: do not print string len in handler_name.
0becb07 h264: Factorize declaration of mb_sizes array.
c99bdd5 lavf: Fix the last PTS to be generated using -fflags +genpts
a03f8ea vsrc_buffer: when no frame is available, return an error instead of segfaulting.
cfec77a configure: add dl to frei0r extralibs.
fa1f92a vf_idet: clean detected frame types based on a 4 frame history.
c59e73d vf_idet: change individual per frame statistics to debug log level.
4d4df31 vf_idet: print accumulated statistics for single and multi frame detection
bfd30fa lavfi/colormatrix: add forgotten tests.
0477254 vf_idet: Print both the single frame based detection and the multi frame one.
1a5c08e vf_idet: Add last_type variable to make code more readable.
ca2b450 vf_idet: use enum to represent the type.
bd60349 asfenc: properly write index information
ae315a6 asfenc: start at object 1 instead of 0
bc13b74 asfenc: remove useless casts
f2fad25 asfenc: reduce code duplication with new variable
1ceff08 asfenc: rename some variables
97d36a1 asfenc: realloc index_ptr fewer times
13cc364 libavfilter: add colormatrix filter
4480edc Merge remote-tracking branch 'qatar/master'
6cecb89 Add forgotten avio-direct reference file.
a45605a Add AVIO_FLAG_DIRECT.
6b81da2 dsputil x86: use SSE float instruction instead of SSE2 integer equivalent
cd88105 dsputil x86: remove deprecated parameter from scalarproduct_int16 prototype
f988852 vp8dsp x86: perform rounding shift with a single instruction
7756859 fate: add BMP tests.
bc0bdda swscale: handle complete dimensions for monoblack/white.
e484265 aacenc: Mark deinterleave_input_samples argument as const.
1f068e4 vf_unsharp: Mark readonly variable as const.
14af74e h264: fix 4:2:2 PCM-macroblocks decoding
fde6314 Merge remote-tracking branch 'dwbuiten/master'
91dffb4 w32threads: Make pthread_cond_wait follow POSIX
6da08c9 w32threads: Make pthread_cond_wait follow POSIX
ca26c2c lavf: add mp1/2 to determinable_frame_size()
c22fd9b allcodecs: move libaacplus down.
a61fada mxfdec: Fix regression on files from Pinnacle Thunder
6fb35db vf_idet: print accumulated statistics at end
baf0c79 vf_idet: set interlaced flags
2941a93 vf_idet: fix indention
5d9cfd8 vf_idet: move statistic variables into the context
02567bd vf_idet: remove unused function
398491a vf_idet: pass context to av_log()
6c7b5b7 vf_ass: use drawutils.
a63712d vf_drawtext: use drawutils.
e8497a3 drawutils: implement uniform and mask blending.
e3e89b6 libavfilter: Add interlace detect filter.
12292f3 v4l2: allow to convert monotonic timestamps.
3dde147 cosmetics: Consistently place static, inline and av_cold attributes/keywords.
d4f05ae sbrdsp: Use standard multiple inclusion guards.
8a9ae37 timefilter: allow to evaluate at other times.
6d21f49 pcm: K&R formatting cosmetics
e29f66d ffmpeg: fix a few typo.
a4e359a mpeg4: dont reset picture_num for xvid
3360b85 h264: fix seeking in low delay streams without IDR
41a097a Merge remote-tracking branch 'qatar/master'
ae3ee72 lavf: print some more things in TS debug statements
b5d433d lavf: increase RELATIVE_TS_BASE
835a893 rawdec: Support fourccs YV16 and YV24
34d908c rtmp: implement bandwidth notification
faba4a9 rtmp: update supported audio codecs value
588eaa1 swfdec: support compressed swf.
b991b30 Unscaled Planar RGB -> RGB support in swscale.
38477e1 vf_lut: avoid rgb component indexing in the inner loop
002d9de vf_lut: optimize rgb codepath
79a1d98 vf_lut: optimize planar case
24e90d0 mxfenc: Don't allow muxing audio-only since it's not supported
b61e596 asf: remove duplicated index_guid
cfd64ee Merge remote-tracking branch 'qatar/master'
3c480f8 h264: fix incompatible pointer type warnings. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11bc558 mpegts: fix a unused function warning
e0541c7 dct-test: fix incompatible pointer types warning
183c3fa des: Fix half a dozen warnings
2663540 ffmpeg: affect source stream index in new_output_stream function
1e05973 movenc: fix segfault with chapter tracks
c450cf1 libavcodec: be less picky on nonsense rc_max_rate / rc_buffer_size combinations.
4989178 Merge remote-tracking branch 'qatar/master'
178f75a snow-test: fix pointer type warnings
5ef5c02 swr-test: remove unused variable
6e1b0cd fft-test: fix all pointer type warnings.
8768872 swr: remove unused variable
dc984da swr: fix pointer type warnings
226671e dsputil_mmx: fix scalarproduct prototypes
b76a160 txd: Fix "set but not used" warning
0aaa45e FATE: Add RALF decoding test
b3ab337 audiointerleave: check timebase
ce9bd30 ffmpeg: fix plain -profile support
6a052e6 direcdec: fix infinite loop
7a3df01 The lt and lte functions were swapped.
8df774b avidec: better NI detection.
95587d2 vsrc_buffer: allow buffering arbitrary number of frames.
416fd90 vf_scale: avoid a pointless memcpy in no-op conversion.
63736fe avfiltergraph: try to reduce format conversions in filters.
996f9f0 avfiltergraph: add an AVClass to AVFilterGraph on next major bump.
ddb4431 id3v2: fix skipping extended header in id3v2.4
7c9d693 lavc: check media type of the decoder before calling it.
2f7bd3b Merge remote-tracking branch 'qatar/master'
5216245 indeo4: fix null ptr dereference
6bd9744 FATE: Add RALF decoding test
d3db898 indeo4: check that num_mbs matches
420d1df apedec: check bits <= 32.
3768445 tm2dec: fix overread
c265b77 cavs: Remove unused code.
f9143d2 ividsp: prevent pointers from going outside and overreading.
12038ab ividsp: zero pitch so as not to overread
874ac0b indeo5: change AVCodecContext w/h when internal ones change.
d2a6074 fate: update regression checksum due to 95ce0ddcfe99182365e0e57f5f41d7f1a01c57eb
95ce0dd lavfi/fade: fix black level for non studio-level pixel formats
1a06d6d lxfdec: support version 1 files, too.
40393ac movenc: add some default cases.
50059bd MOV: Fix old-style muxed raw-audio data.
e0ad7f7 MOV: bail out to toplevel when encountering a trak or mdat chunk.
2d54bbb vsrc_buffer: Store allocated scale filter and free it later.
c5f9a66 avfilter: allow freeing NULL.
a79af8e dcttest: put ff_prores_idct_put_10_sse2_wrap under HAVE_YASM
10b1c06 oggenc: fix condition when not to flush due to keyframe granule.
ed3e1b4 oggenc: add pagesize option to set preferred page size
67aec40 libspeexdec: set frame size in libspeex_decode_init()
2b6325c Merge remote-tracking branch 'qatar/master'
96df29c svq3: Fix pointer type mismatch warning.
280beeb cavsdec: initialize all tables to zeros.
12cbbbb smacker audio: sign-extend the initial 16-bit predicted value
a627c1a svq1enc: fix ptr type mismatch warning
e2094bd mpeghaudiodec: Fix "set but not used" warnings
8307025 mjpegdec: Fix "assignment from incompatible pointer type" warnings
03757d4 j2kenc: Fix "function declaration isn’t a prototype" warning
cb9fe27 j2kdec: fix format strings
3ebfe22 interplayvideodec: pass correct pointer to av_dlog()
90f9b06 dvbsubdec: Fix "set but not used" warning
a76a2ff libavformat: Fix several "incompatible pointer type" warnings.
ec0965b cavsdec: ensure the tables have been allocated before using them
b691fd7 h264: drop ff_h264_ prefix from static function ff_h264_decode_rbsp_trailing()
9ad80ef h264: Make ff_h264_decode_end() static, it is not used externally.
afd8a39 output-example: K&R formatting cosmetics, comment spelling fixes
2b7c0c9 Merge remote-tracking branch 'qatar/master'
d3d5e84 img2dec: remove GLOB_TILDE support.
93f6d04 avf: make the example output the proper message
28db30a avf: fix audio writing in the output-example
3e1ff8e img2dec: Recognize glob meta chars only if prefixed by %
0be130e img2: glob matching for image series
d61ef05 ffmpeg: check pts like dts for being in the past.
4f7c762 mov: don't overwrite existing indexes.
0399fe0 lzw: fix potential integer overflow.
b7b1509 truemotion: forbid invalid VLC bitsizes and token values.
bf39d3b truemotion2: handle out-of-frame motion vectors through edge extension.
30ced7e lavf: print ts values in pts < dts error message
9bd41bb configure: Check for a different SDL function
4204364 ffmpeg: switch duration calculation code from avg to r frame_rate.
a05c41a mp3dec: perform I/S and M/S only when frame mode is joint stereo.
f704eb6 id3v2: add another mimetype for JPEG image
282ec72 Do not try to use lowres for unusual jpg subsampling.
9a0f2b7 Revert "Fix compilation with hardcoded tables."
1dab5ef fate/vp8-size-change: set bitexact flag
a37a281 ffmpeg: pass bitexact flag to vsrc_buffer
ddd8974 iff: prevent a possible crash with broken/prepared IFF PBM
aebce0b Merge git://github.com/mjbshaw/FFmpeg-OpenJPEG-J2K-Encoder
9aeacc9 ffmpeg: dont disable dr1 when changing dimensions are encountered in codec_get_buffer().
e5c3b51 ffmpeg: disable dr1 when frame sizes change.
8c2045c avfilter: set w/h in avfilter_fill_frame_from_video_buffer_ref().
d40ff29 Merge remote-tracking branch 'qatar/master'
ddcf67c lzw: prevent buffer overreads.
28e8c4d WMAL: Remove inaccurate and unnecessary doxy
63a1b48 h264: fix cabac-on-stack after safe cabac reader.
b678dd9 Fixes ticket 1127. I'm still looking into why bpp is getting set to 0.
99bb88c doc/ffmpeg: update and extend documentation for -copytb
bd508d4 truemotion2: convert packet header reading to bytestream2.
44257ef asf: only set index_read if the index contained entries.
a940198 cabac: add overread protection to BRANCHLESS_GET_CABAC().
448dc42 cabac: increment jump locations by one in callers of BRANCHLESS_GET_CABAC().
16f6e83 cabac: remove unused argument from BRANCHLESS_GET_CABAC_UPDATE().
951014e cabac: use struct+offset instead of memory operand in BRANCHLESS_GET_CABAC().
a0bdcb0 h264: add overread protection to get_cabac_bypass_sign_x86().
95bfa4e h264: reindent get_cabac_bypass_sign_x86().
db02592 h264: use struct offsets in get_cabac_bypass_sign_x86().
7374fac h264: fix overreads in cabac reader.
247fbf0 ass: fix aspect ratio computation.
d360dd9 wmall: fix seeking.
0a82f52 lagarith: fix buffer overreads.
c0b34e6 dvdec: drop unnecessary dv_tablegen.h #include
c44417e indeo4: Dont leave tables in random state on errors.
a74d721 indeo4: apply correction to eob/esc indexes too
92f7f1d indeo4: Check for mismatching scan tables
2efb710 build: fix doc generation errors in parallel builds
a60a4d7 vc1dec: Fix global array overread.
8db2935 apedec: fix global array overread
a92be9b Replace memset(0) by zero initializations.
856c8e0 faandct: Remove FAAN_POSTSCALE define and related code.
a839dbb dvenc: print allowed profiles if the video doesn't conform to any of them.
3c6607e avcodec_encode_{audio,video}: only reallocate output packet when it has non-zero size.
e2e165c FATE: add a test for vp8 with changing frame size.
7a5e587 apedec: check bits <= 32
936951c tm2dec: check total_frames and extradata_size.
b17b296 Fix compilation with hardcoded tables.
d0dafeb tm2: Fix overread of token array.
11cc209 lzw(gif): Fix overread
96d0494 lagarith: Fix various issues that lead to out of array reads.
44bd50f lagarith: fix flipped return value
c30d04c lagarithrac: fix length used in ff_lag_rac_init()
7b453d1 Merge remote-tracking branch 'qatar/master'
4a619fc h263dec: Restore w/h values to a consistent state if a change is rejected.
e74d6da fate: add kgv1 fate test.
3c63974 id3v2: support JPEG APIC with incorrect (image/jpg) MIME type
e4cc9f3 Support FLIC in AVI.
e206b51 Merge remote-tracking branch 'cus/stable'
eed691f oggdec: calculate correct timestamps in Ogg/FLAC
e6093e3 ffplay: pause rdft column when ffplay is paused
a0340df XBM decoder
1cd8510 j2kdec: move ff_j2k_init_tier1_luts() to j2kdec_init()
6fa998c Clarify the use of the interl=1|-1 option of the scale filter.
7ea948b alsdec: check return values.
55abaa5 westwood_vqa: fix SND0 chunk handling
f0a343f westwood_vqa: set video stream duration
98df2e2 raw: forward avpicture_fill() error code in raw_decode().
28a613b h264: dont mess with chroma planes for grayscale h264.
dfacef9 alsdec: make sure no invalid opt_order stays in the context.
1acc553 vc1dec: dont ignore ff_vc1_parse_frame_header_advs return value
e3bd612 vc1dec: avoid == -1 checks for errors.
b378a23 vc1dec: sanity check state used in get_mvdata_interlaced()
dcd013a oma: dont over-read buffer
6999f8b Merge remote-tracking branch 'qatar/master'
8e0b7e2 build: Do not explicitly add the doc directory to the OBJDIRS list.
d724fe6 dv: Split off DV video decoder into its own file.
9f43fdd build: fix RALF decoder standalone compilation, which depends on Golomb code
d7ce1a4 configure: Drop stray duplicate entry for --disable-fft from help output.
904100e make av_interleaved_write_frame() flush packets when pkt is NULL
ab31db0 doc: clarify dshow input requirements
0f3886f j2kdec: remove pointless swapping
ebbf10e j2kdec: vertically align AVCodec members
75625c6 j2kdec: Remove useless .pix_fmts.
ddfa375 j2kdec: convert to bytestream2 API
c9024a9 mpegts: Fix dead error checks
95b192d vc1: Do not read from array if index is invalid.
2ad4055 targa: convert to bytestream2.
a0820ea ffmpeg: fix handling or empty audio packets
b62b9df ffmpeg: more verbose error messages in case of audio encoding failure.
8b58f6b Revert "raw: move buffer size check up."
5484170 rv34: set mb_num_left to 0 after finishing a frame
7f9b42f j2kenc: cosmetics: vertically align AVCodec members.
a650162 libopenjpegdec: hack to fix GRAY16 decoding
d6eef54 vc1dec: move mquant zero check down.
43fd321 targa: Fix input buffer size check.
8f0d9b4 RELEASE: bump to current version (0.10.2).
fb8469d APIchanges: fill in missing dates and hashes.
29679f4 aac: reference supported sample rates in encoders.
21d650c ffmpeg: more expressive sample rate automatic selection.
a67d9cf lavfi: add avfilter_fill_frame_from_{audio_,}buffer_ref().
a84851b indeo3dec: check mv bitstream pointer
8a521d5 indeo3dec: Fix end pointer.
7e496e1 Merge remote-tracking branch 'qatar/master'
60497cb Enable generic index/seeking for mgsts demuxer.
699c61d Handle 0-size sync packets when only parsing headers.
fca62f0 Support FLIC in MOV.
72ccfb3 build: ppc: drop stray leftover backslash
5afd9a8 als: consistent messages
3f26a87 libopenjpegenc: remove leftover because older version of patch being applied
04dc7e7 ALS error message pretty print
cece491 qdm2: Fix out of array writes
fe91bec qdm2: fix out of array read
7d74aaf qdm2dec: fix out of array read
3b370ab mxfdec: fix off by one error.
e7e19b1 build: Only clean the architecture subdirectory we build for.
6a7c531 build: drop some unnecessary dependencies from the H.264 parser
ad0e31f build: prettyprinting cosmetics
8039155 libavutil: Remove pointless rational test program.
193d7ee libavutil: Remove broken and pointless lzo test program.
967923a lavf doxy: expand AVStream.codec doxy.
e44ada1 lavf doxy: improve AVStream.time_base doxy.
f58b8cc lavf doxy: add some basic documentation about reading from the demuxer.
10fa4ff lavf doxy: document passing options to demuxers.
dca9c81 lavf doxy: clarify that an AVPacket contains encoded data.
3fadb29 mpegtsenc: allow user triggered PES packet flushing
9c47f2b APIchanges: mark the place where 0.7 was cut.
75bdd55 APIchanges: mark the place where 0.8 was cut.
5d20e7b APIchanges: fill in missing dates and hashes.
3dc0b9d libopenjpegdec: refactor some code and fix memory leaks
02fb320 libopenjpegdec: always check image because decoding may still fail
67d5fcc libopenjpegenc: allow changing encoding parameters
dec8eb6 libopenjpegenc: merge common code
8e45005 libopenjpegenc: use pix_fmt descriptor to get bpp
06b0c6a libopenjpegenc: use pix_fmt descriptor to get numcomps
140c54e indeo4: better mv check
c855ece indeo5: check motion vectors.
33f39c0 mxfdec: pass correct context to av_timecode_init()
b2af057 smacker: convert palette and header reading to bytestream2.
4082198 vf_hflip: accept PIX_FMT_RGB444 and PIX_FMT_BGR444 pixel formats
25b67dc png: fix warning about discarding qualifiers [-Wincompatible-pointer-types]
aa9c2e4 pthread : Remove lock/unlock pairs in worker loop to avoid unexpected state changes.
9621646 Merge remote-tracking branch 'qatar/master'
c3bbd0b alac: convert extradata reading to bytestream2.
8d7f2db swr-test: test the new flexible buffering
59b038b swr: realloc_audio: support packed audio buffers
1b0fcf3 swr: More flexible and convenient buffering
e479013 Fix SVCD scan_offset option
6809818 "Metal Gear Solid: The Twin Snakes" demuxer
1318b14 CrystalHD: Remove EXPERIMENTAL flag for known good formats.
5420523 pthread: return proper error code on pthread_create failure
e0c7128 swr: fix segfault when 0 out size is used.
691b924 swr: revert stray hunk
6d797ac VC1: Do not needlessly use signed types.
31ff2cb DV: detect another case of broken DV files.
feda266 DV: check coded_width/height instead of width/height.
535eed9 vqavideo: fix decoding of samples with no partial updates.
62ce9de x86: dsputil: prettyprint gcc inline asm
3b54912 x86: K&R prettyprinting cosmetics for dsputil_mmx.c
915a2a0 x86: conditionally compile H.264 QPEL optimizations
3816642 dsputil_mmx: Surround QPEL macros by "do { } while (0);" blocks.
5d115c1 Ignore generated files below doc/.
7e59237 resample: Fix boundary handling with fragments.
8b11ae8a swr: Fix partial flushing.
19342bc swr: test partial flushing
86e3289 mov: fix heap buffer overflow
3a3f06b dpcm: convert to bytestream2.
4f16153 swr: allow flushing in multiple steps if the output is too small.
8bf95e8 Merge remote-tracking branch 'qatar/master'
f31a68e interplayvideo: convert to bytestream2.
f4c380a ffmpeg: drop struct from SwrContext.
ac6798d swr: fix compilation failure with old versions of gcc.
68893af movenc: Merge if statements
bcae7f4 libaacplus: switch to encode2()
cb34867 h264: fix memleak in error path.
147ee4c pthread: Immediately release all frames in ff_thread_flush()
6ef4063 h264: Add check for invalid chroma_format_idc
15890d6 swr: drop SWR_CH_MAX with the next major ABI bump
ec0ed97 utvideo: port header reading to bytestream2.
947215a swr: dont use SWR_CH_MAX in the public function declaration.
1937c4e swr: make SwrContext a typedef.
74656bd swresample: support up to 32 channels
d5ed5e7 avc: Add a function for converting mp4 style extradata to annex b
2ee01fb pthread: free progress if buffer allocation failed.
bc1ef85 lavc/avconv: support changing frame sizes in codecs with frame mt.
e20ad71 libavformat: Document who sets the AVStream.id field
72dadaa utvideo: mark output picture as keyframe.
f8ba7c4 adxenc: fix error in merging from qatar
7ed9abf sonic: mark as experimental
229e4c1 indeo5dec: Make sure we have had a valid gop header.
9879b50 truemotion2dec: Fix overread of input.
71e78e1 cavsdec: check stc in decode_slice_header()
cc96530 sunrast: Add support for negative linesize.
9a57a37 h264: move resolution change check further up.
14ba747 vp8: fix update_lf_deltas in libavcodec/vp8.c
9d3032b alsdec: check opt_order.
2c0559d mpegvideo: increase buffer sizes.
8a20774 indeo4: Fix global array overread.
5cddfc5 Fix linking without yasm.
494bce6 ralf: read Huffman code lengths without GetBitContext
f58f75d Merge remote-tracking branch 'qatar/master'
b222c28 libopenjpegenc: switch to encode2()
a5b8233 libopenjpeg: make .long_name usefull
68a257e bintext: build decoders only if they are actually enabled
d85b3c4 vp56dec: avoid freeing the returned frame before returning it.
2571506 cavsdec: check for changing w/h.
ba775a5 indeo3: fix out of picture write.
59a4b73 pthread/mpegvideo: detect and block attempts to init frames after setup.
cb7190c rv34: error out on size changes with frame threading
b00307e aacsbr: Add a debug check to sbr_mapping.
0cb93da aac: Reset some state variables when turning SBR off
a237b38 aac: Reset PS parameters on header decode failure.
71c2a70 error_concealment: Prevent FPEs in case of corrupted input.
7beec7e fate: add wmalossless test.
e2d110d Merge remote-tracking branch 'qatar/master'
71ea268 aacsbr: handle m_max values smaller than 4.
adb98a3 VC1: restore optimizations broken in 9a1ced32.
e730036 interplayvideo: give avctx to av_dlog()
0c57f81 interplayvideo: remove superfluous strings from av_log()
a0b07b8 vmdvideo: remove superfluous strings from av_log messages
89cd95b sonic: fix warning about incompatible pointer types
73ad447 rv34: Handle only complete frames in frame-mt.
5ab506a MPV: set reference frame pointers to NULL when allocation of dummy pictures fails
4a584ed configure: die if x11grab dependencies are unavailable
afa6129 zerocodec: factorize loop
ae03b21 swr: check that there is enough information to do rematrixing when needed.
2e909b3 bitstream: build_table, check table_nb_bits.
aae44fb indeo4: check ref_mb
1664edb ffmpeg: check samplerate from decoder.
a22e64f rawdec: Check w/h.
5934d57 xmv: check channel number
08c37a1 mjpegdec: check h/v_count.
46c7842 ituh263dec: Implement enough of Annex O (scalability) to fix a FPE.
4094fc9 avconv: fix the resampling safety factors for output audio buffer allocation
9869e96 avconv: move audio output buffer allocation to a separate function
f3ab3e1 avconv: make the async buffer global and free it in exit_program()
cc41595 error_conceal: fix FPE in guess_dc() with huge sizes.
ac2cb27 mov: Fix FPE on 0 time_scale
c0a99ea indeo4: check band->scan
f927c5b vorbisdemux: Check private context in theoras gtopts.
ae2c33b cosmetics: remove superfluous curly brackets
0e465c1 huffyuv: remove long time disabled code
3a085c6 huffyuv: do not decode/encode yuv colorspace with odd width
ba02069 aacdec: prevent channels from exceeding MAX_CHANNELS.
01fd1aa matroskadec: fix strcmp(NULL)
437f5da mov: fix global unicode convertion array overflow.
0c97fd3 mmdemux: dont set pkt->size to an invalid value.
7c0748c eatqi: replace break by goto.
5a4af04 aacdec: reset max_sfb on invalid data.
3583c87 vqavideodev: Check image dimensions
464cef4 Merge remote-tracking branch 'qatar/master'
9759d2b indeo4: check motion vetors.
afc0cc2 pngenc: make max_packet_size 64bit check check it.
50a3867 png: make ff_png_pass_mask local to pngdec.
abdcb49 Fix libgsm.c compilation after typo in 67b8c8.
5023b89 xwma: Validate channels and bits_per_coded_sample.
86f2ae0 mov: Do not read past the end of the ctts_data table.
3e6e89b mov: Add missing terminator to mov_ch_layout_map_1ch.
6716e68 Merge remote-tracking branch 'qatar/master'
b1a0d69 dcaenc: switch to encode2()
ffa28da Support dropping audio dts/pts via -async -1.
e73c6aa asf: reset side data elements on packet copy.
2621964 wmavoice: fix stack overread.
3c92676 wmalossless: error out if a subframe is not used by any channel.
75d7975 vqa: check palette chunk size before reading data.
d462949 wmalossless: reset sample pointer for each subframe.
326f7a6 wmalossless: error out on invalid values for order.
e9c0b12 FATE: Add ZeroCodec test
f0b4a50 oggparseogm: fix order of arguments of avpriv_set_pts_info().
677df4d pngenc: better upper bound for encoded frame size.
179a592 libutvideoenc: switch to ff_alloc_packet2().
532f1c7 lavc: limit realloc() on encoding to the libav compatibility API.
0f95270 VC1: Fix skiploopfilter=all.
f6b7863 Replace SSE2 instruction in scalarproduct_float_sse() by SSE equivalent.
740b9ff lavc: Redesign the internal encoding API.
dca0e4c avcodec_encode_audio2: use ff_alloc_packet2()
2bd303f zmbvenc: switch to ff_alloc_packet2().
ae7f0d0 yuv4enc: switch to ff_alloc_packet2().
7959eb0 y41penc: switch to ff_alloc_packet2().
a3f36b0 xwdenc: switch to ff_alloc_packet2().
5d8a20a xbmenc: switch to ff_alloc_packet2().
6cb29a1 wmaenc: switch to ff_alloc_packet2().
2ed7975 vorbisenc: switch to ff_alloc_packet2().
079d724 v410enc: switch to ff_alloc_packet2().
efc245b v408enc: switch to ff_alloc_packet2().
f234b02 v308enc: switch to ff_alloc_packet2().
e252fb8 v210enc: switch to ff_alloc_packet2().
219d824 tiffenc: switch to ff_alloc_packet2().
ea8fc91 tiffenc: fix return value.
c038fb4 targaenc: switch to ff_alloc_packet2().
dbb11e7 svq1enc: switch to ff_alloc_packet2().
2ea893f sunrastenc: switch to ff_alloc_packet2().
b911d7d sgienc: switch to ff_alloc_packet2().
c32438c r210enc: switch to ff_alloc_packet2().
78365b4 qtrleenc: switch to ff_alloc_packet2().
37e434e proresenc_kostya: switch to ff_alloc_packet2().
d388dd9 proresenc_anatoliy: switch to ff_alloc_packet2().
6a74c48 pnmenc: switch to ff_alloc_packet2().
5c6c625 pngenc: switch to ff_alloc_packet2().
d2c4b37 pcxenc: switch to ff_alloc_packet2().
11e8f3e pcm: switch to ff_alloc_packet2().
29971e4 pamenc: switch to ff_alloc_packet2().
93aafe2 nellymoserenc: switch to ff_alloc_packet2().
6e3aee0 msvideo1enc: switch to ff_alloc_packet2().
3998b13 mpegaudioenc: switch to ff_alloc_packet2().
a895669 ljpegenc: switch to ff_alloc_packet2().
fcd8a3c libxvidff: switch to ff_alloc_packet2().
d297191 libxavs: switch to ff_alloc_packet2().
660e8cb libx264: switch to ff_alloc_packet2().
316defa libvpxenc: switch to ff_alloc_packet2().
9407cf1 libvorbis: switch to ff_alloc_packet2().
d9375b0 libvo-amrwbenc: switch to ff_alloc_packet2().
b7b2821 libvo-aacenc: switch to ff_alloc_packet2().
b611ffc libtheoraenc: switch to ff_alloc_packet2().
f3b10d3 libspeexenc: switch to ff_alloc_packet2().
bb84112 libschroedingerenc: switch to ff_alloc_packet2().
83fc734 libopencore-amr: switch to ff_alloc_packet2().
c7ef5a4 libmp3lame: switch to ff_alloc_packet2().
67b8c88 libgsm: switch to ff_alloc_packet2().
1308b2d libfaac: switch to ff_alloc_packet2().
7d3ef38 ac3enc: switch to ff_alloc_packet2().
55cc80d a64multienc: switch to ff_alloc_packet2()
076310e snowenc: switch to ff_alloc_packet2()
6eaa31c roqaudioenc: switch to ff_alloc_packet2()
6c77560 roqvideoenc: switch to ff_alloc_packet2()
57c5266 rawenc: : switch to ff_alloc_packet2()
b7d4eeb ra144enc: switch to ff_alloc_packet2()
e22113c mpegvideo_enc: : switch to ff_alloc_packet2()
620559e lclenc: switch to ff_alloc_packet2()
f8a67cb jpeglsenc: switch to ff_alloc_packet2()
35dfeb8 j2kenc: switch to ff_alloc_packet2()
e180079 huffyuvenc: switch to ff_alloc_packet2()
5dadfaa gifenc: switch to ff_alloc_packet2()
c5ea6a5 g726enc: switch to ff_alloc_packet2()
2e4413c g722enc: switch to ff_alloc_packet2()
3f35b66 flashv2enc: switch to ff_alloc_packet2()
8fb7b5f flashvenc: switch to ff_alloc_packet2()
487996f flacenc: switch to ff_alloc_packet2()
ed45636 ffv1enc: switch to ff_alloc_packet2()
8f80e5f dvenc: switch to ff_alloc_packet2()
aa9700c dpxenc: switch to ff_alloc_packet2()
9d44b05 dnxhdenc: switch to ff_alloc_packet2()
ca6a344 cljrenc: switch to ff_alloc_packet2()
f79b09b bmpenc: switch to ff_alloc_packet2()
a18cf36 alacenc: switch to ff_alloc_packet2()
f360e7b sv1enc: switch to ff_alloc_packet2()
a42fa4c adxenc: switch to ff_alloc_packet2()
a8aba06 adpcmenc: switch to ff_alloc_packet2()
7fe8250 aacenc: switch to ff_alloc_packet2()
00663de lavc: add ff_alloc_packet2().
6c9db40 avcodec_encode_audio2: add missing padding to realloc()
afbf9ed udp: lock all operations on shared variables.
e183883 udp: return the error code instead of generic EIO.
5deb5cc udp: call av_fifo_space directly as needed.
63afc4f udp: use non-blocking read instead of select.
aa12978 udp: use pthread_cancel instead of a shared flag.
f036342 aiffdec: set block_duration to 1 for PCM codecs that are supported in AIFF-C
b38b7cc aiffdec: factor out handling of integer PCM for AIFF-C and plain AIFF
2c07c18 aiffdec: use av_get_audio_frame_duration() to set block_duration for AIFF-C
02f88ee aiffdec: do not set bit rate if block duration is unknown
4246032 segment: fix null pointer dereference
f1c6954 dvbsub: remove unused variable
53c8967 bbox: remove superfluous initializations
8678af5 flicvideo: remove dead store
f2b91bd latm_parser: remove dead store
f5463d5 sunrastenc: remove dead store
ddbd0ce mjpegbdec: remove dead store
3644098 vqavideo: remove some superfluous " VQA video: "
015fd02 electronicarts vp6: set duration of video stream
8781810 wmall: output packet only if we have decoded some samples
eb98412 doc/examples/decoding_encoding: make the buffer bigger.
109650b Merge remote-tracking branch 'cus/stable'
967facb Merge remote-tracking branch 'qatar/master'
f1fdd20 h264_mp4toannexb_bsf: use i instead of misusing unit_type.
17431f4 Fix type and codetype fields in the MMF header for some phones.
d364009 Fix libspeex decoding.
361c4cd h264_mp4toannexb_bsf: support 24bit lengths
2a4f1d3 Print a warning when using wild guesses as time stamps.
89411ae Replace SSE2 instruction by SSE equivalent.
6aba117 adxenc: use AVCodec.encode2()
54e6cf8 adxenc: Use the AVFrame in ADXContext for coded_frame
38c3b68 pixdesc: put components always in the same order.
68fd077 indeo4: fix out-of-bounds function call.
3b327a4 configure: Restructure help output.
478fd53 configure: Internal-only components should not be command-line selectable.
5ca595f westwood_vqa: set video stream duration
98ca4d2 westwood_vqa: fix SND0 chunk handling
8d393ce aiffdec: Fix SIGFPE on pcm_f32be
5d4017b vorbisenc: use AVCodec.encode2()
e5aab2d libvorbis: use AVCodec.encode2()
8ccf545 libopencore-amrnbenc: use AVCodec.encode2()
330d9d1 ra144enc: use AVCodec.encode2()
f090428 nellymoserenc: use AVCodec.encode2()
32173df roqaudioenc: use AVCodec.encode2()
b03dcf0 libspeex: use AVCodec.encode2()
57a52f2 libvo_amrwbenc: use AVCodec.encode2()
db440fa libvo_aacenc: use AVCodec.encode2()
27bacfe wmaenc: use AVCodec.encode2()
3493390 lavfi: add tile video filter.
7084985 vsrc_color: port to new drawutils API.
53b7a3f vf_pad: port to new drawutils API.
8ec0832 drawutils: new API.
87a72b9 swscale: Merge a hunk from qatar that seems to have been forgotten or lost.
8e0d3c0 lavfi/ass: add dar option
c939953 lavfi/ass: use a default DAR value of 1.0
e71e65f lavfi/aspect: check for a negative code from av_parse_ratio()
6cf5392 graphdump: use av_bprintf API.
b75c67d lavu: add av_bprintf and related.
594a3d6 bink: no need to increase width twice
9e69d3c zerocodec: factorize loop
15e0734 ttadec: refactor ttafilter_process()
1a7a707 tgq: use bytestream2_get_bytes_left()
0acacd2 xxan: use bytestream2_size()
ff05fd6 xxan: remove write-only variable
8a90148 smc: use bytestream2_size()
0ee5be4 bytestream: add functions for accessing size of buffer
841e669 cdxl: swap CHUNKY and BYTE_PLANAR
3eaf712 sgienc: fix packet size.
0ebd836 Merge remote-tracking branch 'qatar/master'
b0f75ba mpegaudioenc: use AVCodec.encode2()
3d853d7 libmp3lame: use AVCodec.encode2()
1987a94 libgsmenc: use AVCodec.encode2()
d1afb2f libfaac: use AVCodec.encode2()
59041fd g726enc: use AVCodec.encode2()
bb03b6f g722enc: use AVCodec.encode2()
910bdb9 flacenc: use AVCodec.encode2()
24e74f0 adpcmenc: update to AVCodec.encode2()
aa872af ac3enc: update to AVCodec.encode2()
ad95307 aacenc: use AVCodec.encode2()
745a33a fate/zerocodec: fix permissions
4bf6496 avcodec: add code for a frame queue for use by audio encoders with delay
c9594fe avconv: free packet in write_frame() when discarding due to frame number limit
e056f8d FATE: use +/- flag option syntax for vp8 emu-edge tests
15db6a9 pngenc: Fix incorrect mask used for interlaced mode.
a673320 lavf: make av_interleave_packet_per_dts() private.
3c90cc2 lavf: deprecate av_read_packet().
f63412f oggdec: output correct timestamps for Vorbis
9b9fc9b avconv: pass input stream timestamps to audio encoders
a1977e0 lavc: shrink encoded audio packet size after encoding.
777365f xa: set correct bit rate
a54bc52 xa: do not set bit_rate, block_align, or bits_per_coded_sample
64de57f xa: fix end-of-file handling
cd2ffb6 xa: fix timestamp calculation
1d10afd bink: fix typo in FFALIGN() argument
8ae28ac bink: align plane width to 8 when calculating bundle sizes
8f394a6 pngdec: print error message for truncated pngs even if we output them
309d8ec pngenc: allocate packets that have some chance of being large enough.
393b81f mxfdec: Only parse next partition pack if parsing forward
4ed47d3 pngdec: dont discard incomplete images.
eeb792d pngdec: Print error messages for the various failure pathes.
2ac3df8 doc: pass -Idoc texi2html and texi2pod
b8b207e doc: texi2pod: add -I flag
39f5a54 movenc: Add a min_frag_duration option
ccfa8aa rtsp: Set the default delay to 0.1 s for the RTSP/SDP/RTP demuxers
4fa57d5 libavformat: Set the default for the max_delay option to -1
9dd649c flv: clarify use of video info/cmd frame.
0d0b81f Generate manpages for AV{Format,Codec}Context AVOptions.
4fea895 doc/avconv: remove entries for AVOptions.
5626697 Move AVFormatContext/AVCodecContext option tables to separate files.
40b41be lavf: use AVStream.discard to disable queueing attached pictures.
01fcc42 lavf: requeue attached pictures after seeking.
713f306 id3v2: set the keyframe flag on attached pictures.
30f2d97 zerocodec: Fix license
41bd351 FATE: Add ZeroCodec test
e01f478 ffv1enc: Check context_model
479fb7b Merge remote-tracking branch 'qatar/master'
ee4b143 ffplay: use frame count based queueing for audio queue
a2c5be6 ffplay: reset audio_pkt_temp when opening audio
87c1783 snowenc: move runs from stack to heap.
fc8ed11 avcodec_encode_audio2: Increase the audio buffer size.
791d6df FATE: change fate-maxis-xa to a normal demuxing test
b36872b FATE: add test for adpcm-ea-maxis-xa
30011bf vp8: avoid race condition on segment map.
2b07f57 mp3_probe: consider id3 tags to be low scoring mp3.
e19ccc8 lavfi/aspect: fail with AVERROR(EINVAL) in case of invalid specified aspect
18ba94c fix space type in Changelog
0e714f8 ZeroCodec Decoder
11642cd lavc/sunrastenc: consider cases with linesize < 0
b856063 RealAudio Lossless decoder
316e724 rtpenc: Use AVFormatContext.packet_size instead of a private option
01b0ade url: Document the expected behaviour of url_read
57151f8 libavformat: Use AVFormatContext.probesize in init_input
27b7459 docs: Fix a stray reference to tags in the generic doxy on dicts
f645132 gxf: return AVERROR_EOF instead of AVERROR(EIO) at end of gxf_packet function
17934c1 cosmetics: Align some AVInput/OutputFormat declarations
78f2833 Tell users about supported audio samplerates in mmf.
0d29388 Match documentation for transparency in BGR32 iff images.
bb39bd1 zmbv: check decompress result
afc2263 zmbv: correct indentation
e8f2c0c h264: print the pps_id when its invalid.
6cabb67 ZeroCodec Decoder
bae053f Merge remote-tracking branch 'qatar/master'
1744ab9 adpcm: convert adpcm_thp to bytestream2.
72eda77 adpcm: convert adpcm_yamaha to bytestream2.
f184735 adpcm: convert adpcm_swf to bytestream2.
8afe2f9 adpcm: convert adpcm_sbpro to bytestream2.
834c81f adpcm: convert adpcm_ct to bytestream2.
b3084e2 adpcm: convert adpcm_ima_amv/smjpeg to bytestream2.
22c48d3 adpcm: convert adpcm_ea_xas to bytestream2.
edd9555 adpcm: convert adpcm_ea_r1/2/3 to bytestream2.
e60d099 adpcm: convert ea_maxis_xa to bytestream2.
4a876eb adpcm: convert adpcm_ea to bytestream2.
524af48 adpcm convert adpcm_ima_ea_sead to bytestream2.
8f2ed09 adpcm: convert adpcm_ima_ea_eacs to bytestream2.
159831c adpcm: convert adpcm_xa to bytestream2.
16b7a5e adpcm: convert ima_ws to bytestream2.
74d7ac9 adpcm: convert adpcm_ima_apc to bytestream2.
9721901 adpcm: convert adpcm_ima_iss to bytestream2.
1da9587 adpcm: convert adpcm_dk3 to bytestream2.
d570a96 adpcm: convert adpcm_dk4 to bytestream2.
5353ee3 adpcm: convert adpcm_ms to bytestream2.
89f3aa8 adpcm: use av_clip() in adpcm_ima_expand_nibble().
689be85 adpcm: convert adpcm_4xm to bytestream2.
39505f4 adpcm: convert adpcm_ima_wav to bytestream2.
9604307 adpcm: convert adpcm_ima_qt to bytestream2.
c346f63 adpcm: fix nb_samples rounding for adpcm_ima_dk3, and update reference.
72ec043 oma: Fix out of array read.
7f4c5ab build_sys: zmbv test depends on zlib
1939e82 build_sys: zlib_test depends on zlib
7a21020 build_sys: mpng_test depends on zlib
825936b build_sys: flashsv2_test depends on zlib
395894f build_sys: Add dependencies for pp testing.
d19d52d lavfi/movie: add loop parameter
0ca15aa lavc/jpeglsenc: fix allocation in case of negative linesize, and add malloc check
a41340f pgmyuvenc: abort encoding if width is not even
eb74e9e mxfdec: Let pkt->pts = mxf->current_edit_unit if intra-only
a56fba5 fate: make compare() function compatible with POSIX bc
f36d5c1 Update Janne's email address.
343bfdd APIchanges: Replace Subversion revision numbers by Git hashes.
f03183d bytestream: Eliminate one level of pointless macro indirection.
abe3c69 xwd: convert to bytestream2.
5a3a906 vqavideo: port to bytestream2 API
572c0dd indeo4: Skip null frames.
7594ee2 jpg: fix colors for sequential RGB
0f6f5e6 vorbisenc: set quality to a reasonable default.
fdffaa6 lavfi/scale: document behavior with regards to the output sample aspect ratio
050dc12 Read preset files with suffix .avpreset
6acac06 prores: allow user to set fixed quantiser
2560d3b dv: Fix streamcopy input.
50d67d9 x11grab: fix compilation
79a19f6 pthread: Fix mixing of declarations and statements.
967bdb8 Merge remote-tracking branch 'qatar/master'
8bc5d90 lavf: remove some disabled code.
f35f8ee lavf: only set average frame rate for video.
9ade26e lavf: remove a pointless check.
219a6fb dsp: fix diff_bytes_mmx() with small width
0afd8f1 avcodec: add XBM encoder
6ca3b24 resample: allocate a large enough output buffer
b1740cb fate: fix enc_dec_pcm tests with remote target
69174fa vf_thumbnail: forward request_frame at least once.
c3da9f5 wmaenc: remove bit-exact hack
85cf49f FATE: remove WMA acodec tests
3a1e453 FATE: add WMAv1 and WMAv2 encode/decode tests with fuzzy comparison
a4cf4ef FATE: add AC-3 and E-AC-3 encode/decode tests with fuzzy comparison
463705b udp: fix non-blocking and interrupt handling.
d9f26a0 lavfi/crop: show input and output sample aspect ratio in the log
e55ecbc url: document url_read exact behaviour.
0ac38de lavfi/allfilters: fix weird vertical align
3225bc3 lavfi: add bbox filter
32a5775 pcm: leave sample format conversion to libswresample
8a91da9 Merge remote-tracking branch 'qatar/master'
4c1da0d ffmpeg: allow selective and complete disabling of map_metadata.
de64d8c qtrle: Use bytestream2 functions to prevent buffer overreads.
341404f vqavideo: check malloc return values
d3958ab x11grab: fix a memory leak exposed by valgrind
05b9a89 threads: fix old frames returned after avcodec_flush_buffers()
7b60799 MPV: always mark dummy frames as reference
1e26a48 h264: fix deadlocks on incomplete reference frame decoding.
c6ccb96 mpeg4: report frame decoding completion at ff_MPV_frame_end().
80387f0 mimic: don't use self as reference, and report completion at end of decode().
f8353d5 mpegvideo: don't pretend the first frame is always a key frame
e5d4037 h264: K&R formatting cosmetics
ad4cec6 s3tc.h: Add missing #include to fix standalone header compilation.
90e5b58 FATE: add capability for audio encode/decode tests with fuzzy psnr comparison
cffd758 FATE: allow a tolerance in the size comparison in do_tiny_psnr()
bb68429 FATE: use absolute difference from a target value in do_tiny_psnr()
5ecadc6 FATE: allow tests to set CMP_SHIFT to pass to tiny_psnr
0720d26 FATE: use $fuzz directly in do_tiny_psnr() instead of passing it around

git-subtree-dir: captive/ffmpeg/csrc
git-subtree-split: 40b7a27bad8b8b35cb215bf4f4cba02a00d6f9e2
Merge commit '4b9af79b08f79b41b9182d48772d423f553df811' into development