Squashed 'captive/libx264/csrc/' changes from 5c85e0a..69a0443

69a0443 Add mb_info API for signalling constant macroblocks Some use-cases of x264 involve encoding video with large constant areas of the frame. Sometimes, the caller knows which areas these are, and can tell x264. This API lets the caller do this and adds internal tracking of modifications to macroblocks to avoid problems. This is really only suitable without B-frames. An example use-case would be using x264 for VNC.
df6252c Faster chroma weight cost calculation
cce88eb Add Level 5.2 support
ee30c84 Eradicate all mention of Extended Profile x264 never supported it and never will because nobody uses it.
8ca49cc Fix disabling of mbtree when using 2pass encoding and zones
3691332 configure: force select -mXX gcc option for i386/x86-64 Makes multilib compilation more convenient.
e1ccbf9 Update config.guess and config.sub Adds support for a bunch of targets, including: aarch64 (armv8) arm-linux-androideabi
f876197 configure: correct use of RC variable and add --extra-rcflags
35cf912 ICL/MSVS: Fix shared library generation and usage MSVS requires exported variables to be declared with the DATA keyword, and requires that imported variables be declared with dllimport. This does not fix x264 cli being unable to use a shared library built by ICL however.
259a6e5 Fix intra-refresh + hrd
e0351cd Fix frame input colorspace check
7392c8c Fix comment in deblock.c The code does, in fact, handle CAVLC+8x8dct correctly already.
6979713 Fix sliced-threads ratecontrol bug Was using qp instead of qscale; could cause NANs (not to mention less accurate results).

git-subtree-dir: captive/libx264/csrc
git-subtree-split: 69a0443e7d8ab032a7f3c3468a42177d5e64daa2
Merge commit 'f98fe69f9c9da75c9ef58f448f0bb72a7f3f9498' into development
Squashed 'captive/ffmpeg/csrc/' changes from 40b7a27..cab15f9

cab15f9 ffv1: remove clear_state(), it has become unused
83bf9fb ffv1: move clear_state() to clear_slice_state() in encoding threads
68a9194 ffv1: indent
3f4c0da ffv1: move init_slice_state() into the decoder threads.
60217b5 ffv1: Remove slice count field with 1.3 and just count slices.
3ed6917 ffv1: store slice size with all slices in 1.3
c24ca7b ffv1: add 1 status byte to slices in in case crcs are stored too.
0c27854 ffv1: Always store slice size when error reobustness is enabled.
16524d1 ffv1: include solution hint in the slice error message
8f89954 Merge remote-tracking branch 'qatar/master'
fe5bc46 ffv1: support vlc mode in 1.3
3158160 ffv1: move the decoder side ac->vlc switch to decode_slice()
44f789c ffv1: allow selecting 1.3 by using -level
e37419a ffv1: move ac->vlc switch to encode_slice()
2b336df parseutils: reliably detect out-of-range alpha.
44bd2f9 ffmpeg: Fix initial dts for streamcopy, if the input packets lack dts.
ae0591f Add missing newline in shorten decoder.
fd2cd64 avfiltergraph: fix format selection.
62b745a ffmpeg: do not report EOF as an error.
9c99bc4 mpc8: print error messages on maxband(s) errors
88ee2aa mpc8: make maxband check less picky.
8c4022a avconv: fix a segfault on -c copy with -filter_complex.
3bbf3f7 Merge remote-tracking branch 'qatar/master'
2e8f19d avfiltergraph: free the sink_links heap.
c799e46 Get rid of tests/data/asynth-%.sw rule.
2954574 indeo4: check quant_mat more fully.
53253a0 Simplify asynth sample generation.
462a5b7 isom: Support more DTS codec identifiers.
7521c4b matroska: Clear prev_pkt between seeks.
83b2604 avutil: change default buffer size alignment for sample buffer functions
068d0b4 h264: some fields in SEIs are longer than 25 bits thus use get_bits_long()
1e43786 print_options: warn that the files are generated.
9b84f8a parseutils: add av_parse_time() test.
43b7068 parseutils: make av_parse_time() check for failure.
9246896 parseutils: add FATE test.
99f2910 ffmpeg: directly request frames from filters.
e11110d buffersink: add AV_BUFFERSINK_FLAG_NO_REQUEST.
2d6522b vsrc_buffer: count the number of failed requests.
f75ee40 vsrc_buffer: return EAGAIN if no frame is available.
2ce7972 avfiltergraph: add avfilter_graph_request_oldest().
e0761fe avfilter: add a pointer from links to graph.
78ac49c avfilter: document request_frame return codes.
73bc019 lavf: print a warning if probesize seems not enough.
4d87001 vp8: fix crash due to skiped update_dimensions().
0ca4414 audemux: Add a sanity check for the number of channels
a229d6c Remove libdirac decoder.
8336eb6 matroska: Add incremental parsing of clusters.
1381081 avconv: fix off by one check in complex_filter
269cb67 mpegts: Try seeking back even for nonseekable protocols
70d5439 lowres2 support.
92ef4be Merge remote-tracking branch 'qatar/master'
2e07f42 Support flicvideo with 904 bytes extradata.
2ea5f86 ffmpeg: assert the refcount of decoded frames
22a6a23 ffmpeg: assert the refcount of allocated frames,
cf09496 ffmpeg: assert against creation of cycles in the pools linked list.
be2b927 ffmpeg: stricter refcount check in unref_buffer()
951cbea mpeg12dec: reset data size after parsing extradata.
9b75ae0 swscale: K&R formatting cosmetics (part III)
41abc9d iff: fix null ptr dereference
52fdaf2 audemux: Fix potential integer overflow leading to a division by 0
8aa57b7 audemux: Check channels isnt 0
fd2127a wtvdec: Check that stream private context has been allocated before use.
9a4f5b7 mjpegbdec: check SOS/SOF ordering.
abec654 ffv1dec: Require a valid keyframe for decoding non keyframes.
d526c53 ARM: allow runtime masking of CPU features
23a6e47 ffmpeg: fix validity test for file index.
605f2b6 asv1dec: check extradatasize before reading.
fa5dacc indeo5: check against scaleable frames in non scaleable streams.
2a59abf smackerdemux: Allocate padding for extradata
f7c6753 svq1dec: Fix overread on very small input
b21ba20 wmaprodec: tighter check for num_vec_coeffs
c047afb Merge remote-tracking branch 'qatar/master'
2f06b56 Support broken v210 files with 64 byte padding.
6c0027b dnxhddec: check that the indicated bit depth matches the tables.
8c59e0c xldec: move buffer size check up, it can be done before allocating a frame
94b42da xldec: Check that width is a multiple of 4
d7458bc dsputil: remove unused functions
94c9bf8 mov: Treat keyframe indexes as 1-origin if starting at non-zero.
ba98693 mov: Take stps entries into consideration also about key_off.
2bcbd98 Remove lowres video decoding
80d5168 xmvdemux: prefer av_freep() to deallocate audio stream structs.
1338157 xmvdemux: dont let current_stream become invalid.
95510be avcodec: remove AVCodecContext.dsp_mask
5a35bd9 cook: check subacket count
93bf1aa wmalossless: Ensure that last frame is not written again if nothing was decoded in current packet.
b27383e ffprobe: do not try to decode empty packets.
dd3043d lavfi/setfield: remove stray argument in av_log()
459414b lavfi/setfield: rename variable top_field_first to mode
c97201d lavfi/setfield: add "progressive" option
2994913 avconv: fix a segfault when default encoder for a format doesn't exist.
9849515 Revert "h264: assembly version of get_cabac for x86_64 with PIC (v4)"
e9b1d5a fix swr_convert buffering of packed audio
b5c3f0b utvideo: general cosmetics
a812b59 h264: assembly version of get_cabac for x86_64 with PIC (v4)
7eacd70 aac: Handle HE-AACv2 when sniffing a channel order.
dc878b9 movenc: Support high sample rates in isomedia formats by setting the sample rate field in stsd to 0.
3194ab7 Merge remote-tracking branch 'qatar/master'
9b1f776 Fix compilation with NASM.
f973a85 xxan: Remove write-only variable in xan_decode_frame_type0().
b1563d0 ivi_common: Initialize a variable at declaration in ff_ivi_decode_blocks().
dd5e1fc mxfdec: fix memleak on read error/EOF.
4a80ebe indeo3: Fix reallocation code so that it doesnt become inconsistent.
b0e9edc avcodec: add a cook parser to get subpacket duration
2c22701 ac3dec: Check number of output channels.
1df4914 avsdec: Set dimensions instead of relying on the demuxer.
34c426b ffmpeg: check encoder earlier.
acb1730 FATE: allow lavf tests to alter input parameters
5052980 FATE: replace the acodec-pcm_s24daud test with an enc_dec_pcm checksum test
03caef1 FATE: replace the acodec-g726 test with 4 new encode/decode tests
a6c8cca FATE: replace current g722 encoding tests with an encode/decode test
870165e FATE: add a pattern rule for generating asynth wav files
010943c FATE: optionally write a WAVE header in audiogen
0c0d1bc avutil: add audio fifo buffer
044f727 ffv1: add optional per slice CRCs to detect undamaged slices.
b4fc538 ffv1: move most fields from the frame header to the slice headers with ffv1.3
9408316 ffv1: refactor slice decoding init loop so that the first is less a special case
8456089 ffv1: clear slice state in decode_slice()
c7a435a ffv1: split clear_slice_state() out so individual slices can be cleared.
32883c0 ffv1: split init_slice_state() out so individual slices can be inited
d7a4c43 ffv1: Add a CRC check to the global header with version 1.3
9750254 lavfi/mp: remove libmpcodecs mirror filter
65fa7bc lavfi: add avfilter_unref_bufferp()
455fcf2 avidec: zero extradata padding
ee402df mtvdec: check that the buf is large enough for probing
2a70d83 jvdec: Make sure there is enough data for the id string.
2a976de Merge remote-tracking branch 'qatar/master'
2ff935f build system: remove -wcast-qual
a9cd12e mlpdec: set channel variables after checking them
ab75ad0 Make targa-in-mov QuickTime-compatible for more colour-spaces.
a4a88fd Remove .rodata alignment kludge for Mach-O if a recent enough yasm is used.
b4043ef Print unexpected length of flicvideo extradata.
cbda76c mxfdec: Add missing break in frame layout parsing
70ca163 mxf: Fix frame layout values
c90b8a7 h263dec: Check for width/height changes on frame skips too.
2b98377 dv: Initialize encoder tables during encoder init.
903ccf7 error_concealment: Check that the reference is not NULL
b066046 error_concealment: make sure mbaff flags are 0 as interlaced is not supported.
b7c2358 error_concealment: switch asserts mostly to av_asserts. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5e59a77 vc1dec: check that coded slice positions and interlacing match.
df23d64 h263dec: always enable picture dimensions reverting check.
f2e4465 dv: Replace some magic numbers by the appropriate #define.
9cc338b FATE: pass the decoded output format and audio source file to enc_dec_pcm
c755b1f FATE: specify the input format when decoding in enc_dec_pcm()
705f3d4 x86inc: support AVX abstraction for 2-operand instructions
e73ec92 configure: detect PGI compiler and set suitable flags
d8b0652 avconv: check for an incompatible changing channel layout
74e4bb6 Merge remote-tracking branch 'hexene/stagefright'
6208313 avio: make AVIOContext.av_class pointer to const
9d72c05 nutdec: add malloc check and fix const to non-const conversion warnings
f51b7e5 libstagefright: avoid memory leak
dddd06d Make tiff-in-mov QuickTime-compatible for more colour-spaces.
2343a99 libstagefright: support more output pixel formats
e366e6b Merge remote-tracking branch 'qatar/master'
1d48e88 libstagefright: avoid potential deadlock on output MediaBuffer
a02f8ef h263dec: Prevent dimension changes from leaking on errors in header parsing.
7b915a4 libstagefright: explicitly set positive timestamps as stagefright expects them so
0f53601 ppc: drop unused function dct_quantize_altivec()
aa3f2cb mpegaudiodec: Do not discard mp_decode_frame() return value.
601d072 diracdec: check xybsep
e531e73 indeo: Make sure the to be used vlc table has been initilaized.
c58290e Reset pts_correction state on codec flush.
9ed388f ogm: Fix division by 0
8201092 h264: reset current_slice on context reinit
9f39d3d lavf: check that the context to avformat_open_input() is valid.
abe6330 AVoption doxy: clarify a few needs in relation to AVClass less structs.
3c58300 matroska: do not set invalid default duration if frame rate is zero
fc882b6 Fix build dependencies for libvo-aac and libopencore-amrnb.
124eb7e aacdec: drop channel reseting code.
aa0f84d aacdec: disable new chan_config guessing code from libav.
dbe29db aacdec: more verbose overread error message
ac97d47 mkv: use av_reduce instead of av_d2q for framerate estimation
68526db aacdec: reduce difference to alexs version of aacdec.c
204bcdf mkv: report average framerate as minimal as well
1232723 Merge remote-tracking branch 'qatar/master'
df8d5ea avcodec_string: Favor AVCodecContext.codec over the default codec.
b5d2bf9 cook: Make constants passed to AV_BE2NE32C() unsigned to avoid signed overflow.
a666752 indeo5: dont run the wavelet transform over partially decoded bands.
e90dfa6 yadif: Improve pts calculation for is_second.
7a3d225 CrystalHD: Set aspect ratio.
e128182 CrystalHD: fix pStride value.
ebf6d1d nuv: check buffer size before checking content.
096231d avidec: Dont crash on avi packets that belong to dv streams in dv in avi
9789b6c avidec: document early_exit argument
2677697 matroskadec: check headerstrip data availability.
0f96f0d aacenc: Fix issues with huge values of bit_rate.
a80217a copy pts and format props between lavfi buffer and frame.
c7c976c oggdec: Safety check against stream counts being inconsistent in seek()
9bb3b7d oggdec: Recreate streams only in the 1 stream case.
db6e26d dv_tablegen: Drop unnecessary av_unused attribute from dv_vlc_map_tableinit().
15141f9 Merge remote-tracking branch 'qatar/master'
68ca49d fate: libavutil tests do not require SAMPLES.
b0e7321 parseutils: include errors in test output.
83632cb proresenc: multithreaded quantiser search
8099fc7 riff: use bps instead of bits_per_coded_sample in the WAVEFORMATEXTENSIBLE header
b1041f8 avconv: only set the "channels" option when it exists for the specified input format
788a60d ffmpeg: make max frames work again, after merge
56b9d9b vf_thumbnail: colorspace changed from yv12 to rgb
9bf4134 fate: fix vp8 size change regression
5cd460b vsrc_buffer: fix null ptr segfault
0d115d7 avfiltergraph: More advanced heuristic to select colorspace.
128fa12 fate: gif: change checksum to bgr8 from rgb8 as thats what gets selected now
84cd372 imgconvert: fix regression with fate-gif colorspaces.
052ab20 ffmpeg: fix regression with jpeg pix fmts
89f8637 ffmpeg: fix regression with png
8a28fa0 ffmpeg: choose_pix_fmt: pass target fmt in
4778783 Merge commit '3b266da3d35f3f7a61258b78384dfe920d875d29'
6943fb4 avplay: update get_buffer to be inline with avconv
9fb7e14 aacdec: More robust output configuration.
af2f655 faac: Fix multi-channel ordering
ca332b1 faac: Add .channel_layouts
dcd207c matroskadec: use av_grow_packet in merge_packets.
1a65d50 mem.c: fix wrong comment.
071292b Respect -copyinkf for subtitles.
4a95876 Add skip_to_keyframe stream variable.
b3b1751 rtmp: Support 'rtmp_playpath', an option which overrides the stream identifier
6465562 rtmp: Support 'rtmp_app', an option which overrides the name of application
5e8280d avutil: add better documentation for AVSampleFormat
4fa706a svq3: check the watermark height.
efe1ba7 diracdec: check lowdelay bytes.
a30165c omadec: make sample rate table large enough to prevent out of array reading.
c963189 g729dec: initialize pitch_delay_int_prev to the minimum valid value.
8b84e08 indeo3: add parens around some macro arguments
87a2463 h264: use proper PROLOGUE statement for a function using 8 registers.
31a4501 loco: fix 10l typo (missing case)
47f0bea dsicinav: Check for overread in RLE decode.
71d3c25 smacker: Check get_vlc() return values.
8e77c38 dcadec: fix global array overread.
bdeb54e Support decoding LOCO_CRGBA.
884efd4 indeo4: avoid storing invalid values in quant_mat.
474e31c 4xmdemux: Check chunk size
e74fa25 omadec: check GEOB sizes against buffer size
a10f71c vc1dec: add missing terminating element to mpeg4_video_profiles
e985cfd vc1dec: check end_mb_y / start_mb_y validity
c4ce870 flvdec: allocate large enough buffer so get_bits() doesnt overread
fa1b2c8 ffv1: attempt to workaround intel CC fate issue.
b553a42 doc: Update sample Vim config with suitable (function) indentation settings.
a3dbd45 dv: Merge dvquant.h into dvdata.c where all other DV tables reside.
05afc5f dv: Move static tables only used in one place to where they are used.
aff01de graphparser: set next to NULL on an entry extracted from inputs list
8dfb13e adxdec: Check available space before decoding block.
6d24fe2 segafilm: make the loop condition in film_read_packet() match the contents.
ed66bbf lavfi/aresample: properly propagate pts == AV_NOPTS_VALUE;
4d84c7d yadif: fixed missing error handling for poll_frame.
3be0c86 sws: remove cliping in yuv2rgb code.
689e59b mov: reset dref_count on realloc to keep values consistent.
35e0496 Merge remote-tracking branch 'qatar/master'
88a97d6 indeo5: check for unsupported luma block type
7ce118b doc/filters: update documentation.
9e8aae4 avconv: flush decoders immediately after an EOF.
89605e4 avconv: send EOF to vsrc_buffer.
3e901cb avconv: reindent.
3b266da avconv: add support for complex filtergraphs.
560f777 avconv: make filtergraphs global.
836ce90 avconv: move filtered_frame from InputStream to OutputStream.
6c9eac1 avconv: don't set output width/height directly from input value.
e77c866 avconv: move resample_{width,height,pix_fmt} to InputStream.
9dced85 avconv: remove a useless variable from OutputStream.
b732788 avconv: get output pixel format from lavfi.
fefc656 tiffdec: check overread for packbits
2837d8d alsdec: fix number of decoded samples in first sub-block in BGMC mode.
7af99a0 graphparser: fix the order in which unlabeled input links are returned.
2e21526 avconv: change {input,output}_{streams,files} into arrays of pointers.
ea9367e avconv: don't pass input/output streams to some functions.
44c4170 lzw: check for overread
a63c813 pngdec: check bits_per_pixel for palette mode.
c7dc19d png: make sure the previous frames dimensions match before using it as reference
a9e7e98 error: ensure error codes are signed negative ints.
3118e3b ff_lag_rac_init: fix signedness error leading to out of array read.
2033559 qdm2_fft_decode_tones: fix infinite loop
1a97467 qdm2: Check vlc_stage3_values index.
cb8f519 Set bits_per_coded_sample when encoding Microsoft Video-1.
8cb9f99 Support decoding unaligned rgb24 lagarith.
3892e78 doc: Improve suggested Emacs settings for our coding style.
b1096b6 xan: check for vector_segment overread
b962932 eatgv: check vector_bits
34123ab tiny_psnr: reindent after last commit.
e6f7e22 tiny_psnr: support unseekable raw files.
93927eb ff_ivi_decode_blocks: fix negative scan_pos case.
f0bf9e9 indeo: Check allocated tile size in ff_ivi_process_empty_tile()
5ad7335 indeo5: check tile size in decode_mb_info().
b702768 configure: add dependencies for colormatrix test.
af38823 indeo5: set transform_size like indeo4 does to prevent useage of too large transforms.
0846719 indeo4: check transform size.
5a59d2c utvideo: Remove unused variable 'src_size'
5096399 utvideo: Remove unused variable 'src_size'
c788782 mov: free memory on header parsing failure
4ebd422 mov: fix leaking memory with multiple drefs.
7f77e90 swscale: clip before assigning tables in RGB output functions.
4860625 swscale: fix off-by-one in second coefficient in bilinear filters.
c354576 mpegvideo_enc: fix dts
7432bcf Merge remote-tracking branch 'qatar/master'
01bf2ad indeo4: setup width/height properly.
0b27136 matroskadec: fix null pointer dereference
7bf9e33 vsrc_buffer: fix check from 7ae7c41.
c42efad wtvdec: fix name_size check to consider integer overflows.
83c7803 lagarith: check count before writing zeros.
56dcfe8 Clear residues only in not coded channel. This fixes overwriting coded residues with zeros if first channel is coded and second is not.
b44a5ec latmenc: replace per-frame malloc/free by constant size buffer.
d05625b avidec: handle 0-size packets that exist only in index.
4c53c66 mp3enc: clarify meaning of "Unsupported" messages.
219a9ed libxvid: Reorder functions to avoid forward declarations; make functions static.
7a0cb74 libxvid: drop some pointless dead code
64bd7f8 wmalosslessdec: Reset put bit buffer when num_saved_bits is reset.
dac79c2 wmal: vertical alignment cosmetics
2e13f57 wmal: Warn about missing bitstream splicing feature and ask for sample.
9900dd2 wmal: Skip seekable_frame_in_packet.
07933b4 wmal: Drop unused variable num_possible_block_size.
b3a4351 wmalosslessdec: Fix reading too many bits in decode_channel_residues()
2a7063d wmalosslessdec: fix a get_bits(0) in decode_ac_filter
a0abefb wmalosslessdec: make mclms arrays big enough for whats written into them.
d442c44 wmalosslessdec: Make arrays WMALL_BLOCK_MAX_SIZE big and check samples_per_frame.
9166f48 wmaprodec: check min_samples_per_subframe
b28c678 wmaprodec; fix get_bits(0) case.
97a5add wmaprodec: check num_vec_coeffs for validity
52ec269 lavf: print with debug level the byte positions before and after find_stream_info
91d3cbe avfiltergraph: make the AVFilterInOut alloc/free API public
12e7e1d graphparser: allow specifying sws flags in the graph description.
4e781c2 graphparser: fix the order of connecting unlabeled links.
d7bcc71 graphparser: add avfilter_graph_parse2().
7ae7c41 vsrc_buffer: allow using a NULL buffer to signal EOF.
cca9528 mp3on4: allocate a large enough frame.
c41ac87 avidec: update size when packet is shrunk
9206ac8 swscale: handle last pixel if lines have an odd width.
3f80546 lavfi/drawbox: fix width displayed in place of x.
72b9537 dfa: Fix out of array write in decode_dds1()
d1c95d2 dfa: fix out of array write in decode_wdlt()
f5be795 qdm2: fix a dubious pointer cast
680097c WMAL: Do not try to read rawpcm coefficients if bits is invalid
accea4d mov: Fix detecting there is no sync sample.
f346b6b tiffdec: K&R cosmetics
367d9b2 Merge remote-tracking branch 'qatar/master'
cbf767a avf: has_duration does not check the global one
b089ca8 dsputil: fix optimized emu_edge function on Win64.
ef0ee7f swscale: K&R formatting cosmetics (part II)
90a4306 tiffdec: Add a malloc check and refactor another.
99a3352 faxcompr: Check malloc results and unify return path
62e5ef9 av_image_alloc: Align the width to 8 when align >= 8.
41a052a cmdutils: fix "oswr may be used uninitialized" warning
2ec8789 avpicture_layout: use a endian independant format for the palette.
6555aca configure: escape colons in values written to config.fate
84d7461 mov: zero sc->pb in mov_read_close()
a6b3e6d mov: Fix memory leaks on aborted header parsing.
ab3fcd9 mov: zero extradata_size on deallocation of extradata.
b5ada68 matroska: Fix leaking memory allocated for laces.
fd165a0 mov: Fix harmless OOB read.
a9d114d pthread: Fix crash due to fctx->delaying not being cleared.
de7f22a ac3dsp: call femms/emms at the end of float_to_fixed24() for 3DNow and SSE
3116858 matroska: Fix leaking memory allocated for laces.
97ae370 pthread: Fix crash due to fctx->delaying not being cleared.
27c2fb0 vp3: Assert on invalid filter_limit values.
76538d7 h264: fix 10bit biweight functions after recent x86inc.asm fixes.
2b8374e ffv1: Fix size mismatch in encode_line.
73b7437 movenc: Remove a dead initialization
e9dc616 vp3: Assert on invalid filter_limit values.
bd3ea31 ffmpeg: Compensate non monotonicity errors in the audio TSs.
ca19862 Merge remote-tracking branch 'qatar/master'
5eeecde lavfi/mp: remove 2xsai wrapped filter
b7a7830 lavfi: port 2xsai filter from libmpcodecs
e21dac3 examples/decoding_encoding: remove unused variable "size"
162e400 lavfi: install asrc_abuffer.h header
6048fd2 git-howto: Explain how to avoid Windows line endings in git checkouts.
baaab60 build: Move all arch OBJS declarations into arch subdirectory Makefiles.
4561feb vorbisdec: use correct channels variable.
d1a58af latmenc: validate extradata size.
9540476 latmenc: simplify using avpriv_copy_bits.
eb24def latmenc: Document assumptions when copying the AAC header.
0c1e9c2 latmenc: copy pce config from proper location.
912a838 latmenc: fix muxing of byte-aligned DSE.
18e8fef libxvid: remove disabled code
8274b21 ffmpeg: fix ticks_per_frame for the avi stream copy case
e8c6398 ratecontrol: Use ticks_per_frame to calculate fps.
3b00fd5 wmalosslessdec: Reset residues to 0 if they were not decoded from bitstream.
9f3e781 qdm2: make a table static const
9ffe8ee qdm2: simplify bitstream reader setup for some subpacket types
a31787e qdm2: use get_bits_left()
9e938d2 msmpeg4enc: fix stored fps value
75b3867 lavf: compute_pkt_fields, limit the pts upcorrection to mpeg
733cf0a ffmpeg: add -benchmark_all option.
81a9d32 ffmpeg: move getutime to the start of the file.
7bb3a30 build: Consistently handle conditional compilation for all optimization OBJS.
2ef15b4 avpacket, bfi, bgmc, rawenc: K&R prettyprinting cosmetics
0cd17a6 mjpeg: fix crash with lowres and flipped images
c0af875 vf_lut: fix rgba map regression
277f20c lavf: always call avio_flush in av_write_trailer.
4f6df20 Merge remote-tracking branch 'qatar/master'
992f71e msrle: convert MS RLE decoding function to bytestream2.
8e357e8 latmenc: error out when packet size is too large.
a736eb4 latmenc: Fix ALS in LATM.
fa8a638 latmenc: remove unused return value.
729f90e x86inc improvements for 64-bit
e6ad943 latmenc: remove dead code.
5735f76 h261: move tables from header to .c file.
6952301 ff_samples_to_time_base: support AV_NOPTS_VALUE
e1ce756 avplay: Don't free video filters string until the end of decoding.
e46b625 Merge branches 'stagefright' and 'stagefright-test' into stagefright-test
309a931 Fix memory leaks on failed ff_h264_decode_init()
ca4a3f4 oggparsevorbis: Remove code messing with cur_dts.
44239bd swr: add a swr_flags AVOption
6c704d9 ffmpeg: support changing dither parameters for swr
be4cde2 cmdutils: parse options for swr
c1d404b swr: add a dither_scale parameter to tune the amplitude of the dither.
a2c92e6 swr: pass context to swri_get_dither()
ebbede2 movenc: small refactor mov_write_packet
18b5995 movenc: remove redundant check
f8a237a swr: add triangular highpass dither
1fc4ff2 swr: generate more dither noise to improve quality.
22057e8 swr: add swr_get_class()
9676d8e interplayvideo: fix av_dlog parameter type mismatch
f9a2c5b swr: simplify code by using av_get_bytes_per_sample()
6e9c634 swr: fix copy & pasted comment to match the code.
8702e35 vda: try to fix compile
e387c9d Merge remote-tracking branch 'qatar/master'
b1ef4dc swr: add triangular dither support
0cff3e1 swr: remove unused variable
0170889 swr: add SWR_DITHER_RECTANGULAR to AVOptions array
1ac606b aacsbr: silence message for SBR extension "padding".
5b2be9b swr-test: include opt.h, this is needed for changing options for testing.
7c673d7 swr: use assert in swri_sum2 to check that only supported formats are used.
db2eadb swr: add dither support.
5c1f312 swr: update copyright year for rematrix
679481b Drop some pointless #ifdefs.
2130bd8 rv40dsp x86: use only one register, for both increment and loop counter
272b252 rv40dsp: implement prescaled versions for biweight.
d3c59d5 avconv: use default channel layouts when they are unknown
95a8dac avconv: parse channel layout string
a559d65 nutdec: K&R formatting cosmetics
a40ba3a vda: Signal 4 byte NAL headers to the decoder regardless of what's in the extradata
14f063d mem: Consistently return NULL for av_malloc(0)
e36b25d vf_overlay: implement poll_frame()
90f65dc vf_scale: support named constants for sws flags.
7c59b5c lavc doxy: add all installed headers to doxy groups.
ec57b7d lavc doxy: add avfft to the main lavc group.
8a74029 lavc doxy: add remaining avcodec.h functions to a misc doxygen group.
6aadfbd lavc doxy: add AVPicture functions to a doxy group.
56512ce lavc doxy: add resampling functions to a doxy group.
40ca0e6 lavc doxy: replace \ with /
f038515 lavc doxy: add encoding functions to a doxy group.
c8ef846 lavc doxy: add decoding functions to a doxy group.
199ada4 lavc doxy: fix formatting of AV_PKT_DATA_{PARAM_CHANGE,H263_MB_INFO}
30f3f62 lavc doxy: add AVPacket-related stuff to a separate doxy group.
294b3a5 lavc doxy: add core functions/definitions to a doxy group.
02c39f0 ppc: Add/remove a number of const qualifiers to fix related warnings.
b073819 avconv: allow '-async -1' to disable timestamp sync for audio encoding

git-subtree-dir: captive/ffmpeg/csrc
git-subtree-split: cab15f9db4ba6e390b25dd80d7305bb51b5583c4
Merge commit '0291bde14a57eb7d6c0988ebdce89dbc3cee03db' into development
Merge branch 'development' of github.com:xuggle/xuggle-xuggler into development