Merge commit '24eb3c791606fe98a1591c13a8b2ba6c342bb3b5'

* commit '24eb3c791606fe98a1591c13a8b2ba6c342bb3b5':
  rtmpproto: Avoid using uninitialized memory

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit 'd01e684186bc1631bc176f06b89d33c27ec0d24d'

* commit 'd01e684186bc1631bc176f06b89d33c27ec0d24d':
  mov: do not set avg_frame_rate in the demuxer

Conflicts:
libavformat/mov.c

Not merged
The default fallback code that sets avg_frame_rate guesses the value
from a very small number of frames at the videos start and is wrong in
some cases for the file as a whole.
Now that makes it guess vs guess, but the code in mov is much faster

Also ideally the mov code should be fixed and give a exact avg_frame_rate
based on the actual cts from the index (CTTS/STTS)

If someone has sample(s) which show wrong fps values, please open a ticket
on trac or mail me if its private.

Merged-by: Michael Niedermayer <michaelni@gmx.at>

fate: add a few tests for >8bpc ffvhuff

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/lossless_videodsp: fix diff_int16_c on MIPS

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/x86/lossless_videodsp: Port lorens add_hfyu_left_prediction_ssse3/sse4 to 16bit

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/x86/lossless_videodsp: use SPLATW in add_int16

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Move sub_hfyu_median_prediction_int16() to losslessviddsp

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Move add_hfyu_median_prediction_int16() to losslessviddsp

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Move add_hfyu_left_prediction_int16 to losslessviddsp

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcdoec/huffyuvenc: optimize sub_left_prediction()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Move add/diff_int16 to lossless_videodsp

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

rtmpproto: Avoid using uninitialized memory

If the url ends with .flv, we stripped it but didn't initialize
rt->playpath, doing av_strlcat on an uninitialized buffer.

Signed-off-by: Martin Storsjö <martin@martin.st>

mov: do not set avg_frame_rate in the demuxer

The track duration is often not reliable or is not the duration
represented by the number of frames. In those cases, avg_frame_rate
was reported incorrectly. Removing this code falls back to the
default calculation in avformat_find_stream_info().

This is a partial revert of commit c3aeaa540.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Avoid a possible overflow when reading Nikon avi files.
  Add h263dsp dependency to mpeg1video and mpeg2video encoders.
  Fix compilation with --disable-hwaccel=mpeg1_xvmc,mpeg2_xvmc

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  lavc: deprecate CODEC_FLAG_EMU_EDGE and avcodec_get_edge_width().

Conflicts:
doc/APIchanges
libavcodec/utils.c
libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/jpeg2000dec: fix error detection in pix_fmt_match()

Fixes out of array accesses with CODEC_FLAG_EMU_EDGE

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/jpeg2000dec: calculate planar and pixelsize from pixel format descriptor

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/vmnc: Check  that rectangles are within the picture

Prevents out of array accesses with CODEC_FLAG_EMU_EDGE

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/diracdec: allocate edges internally instead of depending on CODEC_FLAG_EMU_EDGE being not set

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '024db24912a39316b0ef0b7d793307d62da038f4'

* commit '024db24912a39316b0ef0b7d793307d62da038f4':
  mpegvideo: allocate edges when encoding.

Merged-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/mpegvideo_enc: disable direct mode in load_input_picture() for dimensions%16 != 0

We currently read a whole 16x16 block from the input at a few places

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit 'f7e85ee996b3886c2b13e928b83277382311af96'

* commit 'f7e85ee996b3886c2b13e928b83277382311af96':
  lavc: allow the caller to override dimensions in ff_get_buffer()

Conflicts:
libavcodec/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

examples/muxing: remove redundant {}

examples/muxing: change error checks, from "ret != 0" to "ret < 0"

More consistent and more future-proof.

examples/muxing: factorize write_interleave code

Also log output packet information.

examples: add remuxing example

Show how to perform streamcopy from one container to another.

lavc: deprecate CODEC_FLAG_EMU_EDGE and avcodec_get_edge_width().

mpegvideo: allocate edges when encoding.

Allocating edges will be removed from generic code, so the encoder must
handle this explicitly.

lavc: allow the caller to override dimensions in ff_get_buffer()

This will be useful for allocating edges in the encoders.

Avoid a possible overflow when reading Nikon avi files.

Suggested-by: Reimar

Add h263dsp dependency to mpeg1video and mpeg2video encoders.

Fixes compilation with:
configure --disable-everything --enable-encoder=mpeg2video --disable-asm

Fix compilation with --disable-hwaccel=mpeg1_xvmc,mpeg2_xvmc

Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Allow decoding of slightly broken Nikon avi files.

Merged-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/x86/dsp: add_int16_mmx / add_int16_sse2

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/dsputil/huffyuv: move diff int16 and add int16 to dsputil

This also fixes masking the bits

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Allow decoding of slightly broken Nikon avi files.

Fixes ticket #3330.

vp8: remove redundant "equals 1" test

mb_layout is either zero or non-zero.

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

lavf: add avformat_get_mov_video_tags() and avformat_get_mov_audio_tags()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  eac3: cosmetics, re-indent.

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit 'ade75fb811500f3e3f284737f123938d83be728f'

* commit 'ade75fb811500f3e3f284737f123938d83be728f':
  (e)ac3: clip surround mix level indexes.

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit 'c229f571fd3c7d7b567c27c87b2bbcdaee1b0e9f'

* commit 'c229f571fd3c7d7b567c27c87b2bbcdaee1b0e9f':
  (e)ac3: parse and store the Lt/Rt and LFE mix levels.

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '1f604f96ea70503caa642f68a85be6074a5b3f46'

* commit '1f604f96ea70503caa642f68a85be6074a5b3f46':
  ac3: set default matrix encoding modes in parse_frame_header.

Merged-by: Michael Niedermayer <michaelni@gmx.at>

avformat/matroskadec: identify SMI as SVQ3

Fixes part of Ticket3256

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

eac3: cosmetics, re-indent.

(e)ac3: clip surround mix level indexes.

Values 0-2 are reserved, 3 (-1.5dB) should be used instead.

(e)ac3: parse and store the Lt/Rt and LFE mix levels.

ac3: set default matrix encoding modes in parse_frame_header.

Deduplicates some code.

avformat/matroskadec: support QDM2 as generated by mkvtoolnix-6.7.0

Fixes part of Ticket3256

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avformat/matroskadec: support SVQ3 as generated by mkvtoolnix-6.6.0

Fixes part of Ticket3256

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Merge remote-tracking branch 'cigaes/master'

* cigaes/master:
  lavfi/dualinput: fix shortest option.
  lavfi/vf_tile: use av_make_q.
  lavfi/avf_concat: use av_make_q.
  lavfi/af_amerge: use av_make_q.
  lavu/rational: add syntactic sugar.

Merged-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/mjpegdec: Dont skip picture allocation if theres no picture allocated

Fixes Ticket 3245

lavfi/dualinput: fix shortest option.

Fix trac ticket #3315.

lavfi/vf_tile: use av_make_q.

lavfi/avf_concat: use av_make_q.

lavfi/af_amerge: use av_make_q.

lavu/rational: add syntactic sugar.

Add a function to create a rational
and macros for common values.

doc/muxers: add "Options", "Examples", "Syntax", etc. subsections

More consistent with codec docs. Also some minor reorganization of sentences
to fit the new document hierarchy.

Signed-off-by: Timothy Gu <timothygu99@gmail.com>

doc/encoders: add libx264rgb doc and supported pixfmts for libx264(rgb)

Signed-off-by: Timothy Gu <timothygu99@gmail.com>

doc/muxers/segment: fix formula for computing the segment_time_delta value

lavfi/vidstabtransform: apply various documentation/option minor fixes

Improve consistency with the rest of the documentation.

avcodec/aacdec: Dont fail if channels arent known yet

Fixes Ticket3312

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/mjpegdec: Dont treat the lack of a startcode differently from end of the bitstream

Fixes Ticket3303

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/mjpegdec: only run EOI emulation code when there was a scan

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/mjpegdec: update cur_scan also for non-LS jpeg

This should make no difference but the variable will be used in a subsequent commit

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/dnxhdenc: return meaningful return codes

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  h264: check that an IDR NAL only contains I slices

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '9ecabd7892ff073ae60ded3fc0a1290f5914ed5c'

* commit '9ecabd7892ff073ae60ded3fc0a1290f5914ed5c':
  h264: reset num_reorder_frames if it is invalid

Note, num_reorder_frames is not used in the failure case

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '0652e024c680420d298cdf3719d0a0c030173fe3'

* commit '0652e024c680420d298cdf3719d0a0c030173fe3':
  h264: reset ref count if decoding the slice header fails

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '98cc9efc5f6b4dc847ed3b9b60b1c3bcd14e6791'

* commit '98cc9efc5f6b4dc847ed3b9b60b1c3bcd14e6791':
  h264: prevent two matching fields from being both a short/long ref combination

See: 92002db3eb437414281ad4fb6e84e34862f7fc92
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '00dbff4c3e048b4abd01bf805725aabff0fa5ee1'

* commit '00dbff4c3e048b4abd01bf805725aabff0fa5ee1':
  h264: do not call field_end if we do not have a current picture

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '7f0e81db3c4ee6f8ce15058bafa72ce928a89f3f'

* commit '7f0e81db3c4ee6f8ce15058bafa72ce928a89f3f':
  h264: limit allowed pred modes in ff_h264_check_intra_pred_mode() to 3

Conflicts:
libavcodec/h264.c

See: d6a33f5d20b6ef2eae2cbb959b001cb125a564b7
See: 2005fddcbb4e18e8f7c34326e40609e4a2d83c31
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit 'd1b3fabe6945e511bb20fc9ca52b47eb952526ee'

* commit 'd1b3fabe6945e511bb20fc9ca52b47eb952526ee':
  h264: reset first_field if frame_start() fails for missing refs

See: d7599bd8e240b923486bd130a33d38f66bb14eae
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '210881110d3e22cca36edeaca118b5e22c998266'

* commit '210881110d3e22cca36edeaca118b5e22c998266':
  Prepare for 10_alpha2 Release

Conflicts:
RELEASE

Not merged

Merged-by: Michael Niedermayer <michaelni@gmx.at>

h264: check that an IDR NAL only contains I slices

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org

h264: reset num_reorder_frames if it is invalid

An invalid VUI is not considered a fatal error, so the SPS containing it
may still be used. Leaving an invalid value of num_reorder_frames there
can result in writing over the bounds of H264Context.delayed_pic.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org

h264: reset ref count if decoding the slice header fails

Otherwise the ER code might try to use some already freed references.

Fixes possible access to freed memory.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org

h264: prevent two matching fields from being both a short/long ref combination

Fixes possible access to freed memory.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org

h264: do not call field_end if we do not have a current picture

Fixes invalid reads.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org

h264: limit allowed pred modes in ff_h264_check_intra_pred_mode() to 3

Higher modes are not allowed for 16x16/chroma, which is what this
function is used for. Otherwise this function would return 0 (vertical
prediction) for invalid higher modes, which could result in invalid
reads.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org

h264: reset first_field if frame_start() fails for missing refs

In this case we may not have a current frame, while first_field being
set implies we do.

Fixes invalid reads.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org

swresample: Add arm&x86 clobber tests

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

vp9/x86: rename ff_avg[48]_sse to ff_avg[48]_mmxext

pavgb is an sse integer instruction, so the mmxext flag is enough

Signed-off-by: James Almer <jamrial@gmail.com>
Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Prepare for 10_alpha2 Release

avcodec/mpegvideo_enc: fix custom matrixes with jpeg

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

x86inc: speed up compilation with yasm

Work around yasm's inefficiency with handling large numbers of variables
in the global scope.

ffmpeg: change ost->finished to an enum

Idea-by: ramiro
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

ffmpeg: update statistics only when a packet is actually muxed

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

ffmpeg/flush_encoders: dont mux packets once ost->finished has been set

Fixes muxing frames after av_interleaved_write_frame() failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

ffmpeg: properly close down muxers on av_interleaved_write_frame() failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

ffmpeg: check ost->finished in check_output_constraints()

No testcase but it seems logic to stop when finished is set

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

ffmpeg: check ost->finished in reap_filters()

This avoids finished output streams continuing to receive frames

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avformat/metadata: allow ff_metadata_conv() to be called with NULL saftely

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avfilter/vf_elbg: Fixed seed range of elbg filter

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/dnxhdenc: check that qmax is within the supported range

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

dnxhdenc: fix mb_rc size

Fixes out of array access with RC_VARIANCE set to 0

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avformat/riff: fix demuxing of h264 INMC

Its said that there was a mpeg4 sample with the same fourcc, but noone has it
if someone finds it please tell me so i can fix detection of both.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Fix libxvid crash on failing initialisation.

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  avisynth: fix setting packet properties

See: 4cb9c2013662b46e8101d6fdf6c69d41668c8b9a
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '104a97beaffa6348e6fd2c2d07d67c1402322bb3'

* commit '104a97beaffa6348e6fd2c2d07d67c1402322bb3':
  buffersrc: handle non-refcounted frames in av_buffersrc_add_frame() correctly

Conflicts:
libavfilter/buffersrc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '5ef11b8dcc054b230deb9b20493255c14a80597d'

* commit '5ef11b8dcc054b230deb9b20493255c14a80597d':
  yuv4mpeg: set average frame rate

Merged-by: Michael Niedermayer <michaelni@gmx.at>