Merge commit 'a8b19271c3b40ac3c3dc769fe248887acf14ba5a'

* commit 'a8b19271c3b40ac3c3dc769fe248887acf14ba5a':
  avcodec: Add output_picture_number to AVCodecParserContext

Conflicts:
doc/APIchanges
libavcodec/version.h

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

avcodec/mlp: Fix bugs in libavs warning fixes

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

Merge commit '7950e519bb094897f957b9a9531cc60ba46cbc91'

* commit '7950e519bb094897f957b9a9531cc60ba46cbc91':
  Disable deprecation warnings for cases where a replacement is available

Conflicts:
libavcodec/avpacket.c
libavcodec/pthread.c
libavcodec/utils.c
libavdevice/v4l2.c
libavfilter/avfiltergraph.c
libavfilter/buffersrc.c

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

configure: Check for GCC diagnostic pragma support inside of functions

The actual usage of the pragma is within functions and older versions
of gcc only support the pragma outside of functions.

Merge commit '3a7050ffed5ce061b114a11e4de4b77aba8efa0b'

* commit '3a7050ffed5ce061b114a11e4de4b77aba8efa0b':
  build: Add _Pragma macro to disable deprecated declaration warnings

Conflicts:
configure

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

Merge commit '79be2c325c5ee8f7ac9e28399e51986ebe99bb3c'

* commit '79be2c325c5ee8f7ac9e28399e51986ebe99bb3c':
  doc/print_options: Move options headers to a saner place

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

Merge commit 'b5a138652ff8a5b987d3e1191e67fd9f6575527e'

* commit 'b5a138652ff8a5b987d3e1191e67fd9f6575527e':
  Give less generic names to global library option arrays

Conflicts:
libavcodec/options_table.h
libavfilter/avfilter.c
libavformat/options_table.h
libswscale/options.c

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

Merge commit '0d6fa3977b016f1b72b0b24b8834ff9222498548'

* commit '0d6fa3977b016f1b72b0b24b8834ff9222498548':
  rtmp: Add seek support

Conflicts:
Changelog
libavformat/version.h

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

Merge commit '0d8b943d204bd16fcf2f4a59c742e65a401dd3d0'

* commit '0d8b943d204bd16fcf2f4a59c742e65a401dd3d0':
  h264_sei: Return meaningful values

Conflicts:
libavcodec/h264_sei.c

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

Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Forward interlaced field information from mov to ffv1 decoder.
  Do not suggest to use gas-preprocessor if using it would break compilation.

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

Forward interlaced field information from mov to ffv1 decoder.

Only read the information for old ffv1, level/version 3 saves
the information in the bitstream.
Fixes a part of ticket #2190.

Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>

Do not suggest to use gas-preprocessor if using it would break compilation.

gas-preprocessor does not work on ppc with pic and on ppc64.

avcodec/mdec: make block_index static const

avcodec/mjpeg: make 2 outcommented tables static

avcodec/dxtory: make def_lru[8] static

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

avcodec/dnxhdenc: make header_prefix static const

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

avformat/matroskaenc: make 2 tables static that are not used outside matroskaenc

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

movenc: make uuids static const

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

avcodec: Add output_picture_number to AVCodecParserContext

Set output_picture_number in H.264 parser.

Signed-off-by: Diego Biurrun <diego@biurrun.de>

Disable deprecation warnings for cases where a replacement is available

build: Add _Pragma macro to disable deprecated declaration warnings

doc/print_options: Move options headers to a saner place

Give less generic names to global library option arrays

rtmp: Add seek support

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

ttaenc: fix packet size

Signed-off-by: Paul B Mahol <onemda@gmail.com>

h264_sei: Return meaningful values

Signed-off-by: Diego Biurrun <diego@biurrun.de>

avdevice/timefilter-test: dont try to optimize par1 for n0=0 case

for the n0=0 case there are multiple solutions and different
platforms pick different ones
This should reduce the issues with fate and the timefilter test

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

flvdec: silence unused warning

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  h264_sei: K&R formatting cosmetics

Conflicts:
libavcodec/h264_sei.c

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

Merge commit '4c7fd58f8ae729b964b6859eace5ab9a55ce3c8c'

* commit '4c7fd58f8ae729b964b6859eace5ab9a55ce3c8c':
  h264_sei: Remove pointless old comment
  twinvq: Add proper twinvq prefixes to identifiers

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

Merge commit 'f900f35ac8db4ac30df6fda1c27502c2ef9e6ba5'

* commit 'f900f35ac8db4ac30df6fda1c27502c2ef9e6ba5':
  flvdec: Eliminate completely silly goto

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

Merge commit 'e4529df944616917ae8462f5102253ff7f983093'

* commit 'e4529df944616917ae8462f5102253ff7f983093':
  flvdec: K&R formatting cosmetics

Conflicts:
libavformat/flvdec.c

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

Merge commit '390b4d7088b5cecace245fee0c54a57e24dabdf4'

* commit '390b4d7088b5cecace245fee0c54a57e24dabdf4':
  flvdec: Fix = vs. == typo in sample rate check

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

Merge commit 'fd8f91e3f44a2bdbefaaebead388133c5fdd3423'

* commit 'fd8f91e3f44a2bdbefaaebead388133c5fdd3423':
  rtsp: Simplify code for forming the remote peer url

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

jpeg2000dec: simplify jpeg2000_read_bitstream_packets()

23 lines less
less error prone as theres no more need to update *_size on every read

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

avcodec/wmaenc: change commented assert to av_assert

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

mpegts: save last pcr of pcr pids in PES Context

Based on a patch by Reimar Döffinger.
http://lists.ffmpeg.org/pipermail/ffmpeg-devel/2012-September/131610.html

Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

libxvid: cosmetics: Realign the code

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

ffmpeg: raise level for message printed in case of auto-select pixel format

Increase visibility, in order to decrease troubleshooting for
users generating non playable H.264 content.

Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>

lavf/movenc: Write disc number and total number of discs as part of metadata.

Fixes ticket #2731.

lavf/movenc: Write total number of tracks as part of metadata.

Fixes ticket #2157.

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  avframe: have av_frame_get_side_data take const AVFrame*

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

Merge commit 'ee37d5811caa8f4ad125a37fe6ce3f9e66cd72f2'

* commit 'ee37d5811caa8f4ad125a37fe6ce3f9e66cd72f2':
  rtpproto: Allow specifying a separate rtcp port in ff_rtp_set_remote_url

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

h264_sei: K&R formatting cosmetics

Signed-off-by: Diego Biurrun <diego@biurrun.de>

h264_sei: Remove pointless old comment

Merge commit '1851e1d05d06f6ef3436c667e4354da0f407b226'

* commit '1851e1d05d06f6ef3436c667e4354da0f407b226':
  rtpproto: Check the size before reading buf[1]

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

Merge commit '7748dd41be3d6dd6300f14263586af4ee104ead2'

* commit '7748dd41be3d6dd6300f14263586af4ee104ead2':
  avconv: add -n option to immediately exit when output files already exist

Conflicts:
Changelog
doc/ffmpeg.texi
ffmpeg_opt.c

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

Merge commit 'b85dbe68e222586fd77332716eb8ed5724db4e1b'

* commit 'b85dbe68e222586fd77332716eb8ed5724db4e1b':
  avconv: Call exit_program instead of exit in avconv_opt as well

Conflicts:
ffmpeg_opt.c

See: eeddeb6579d8133871dc15f989ab8ffec5b5b396

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

twinvq: Add proper twinvq prefixes to identifiers

flvdec: Eliminate completely silly goto

flvdec: K&R formatting cosmetics

flvdec: Fix = vs. == typo in sample rate check

Merge commit 'c7e921a54ffe7feb9f695c82f0a0764ab8d0f62b'

* commit 'c7e921a54ffe7feb9f695c82f0a0764ab8d0f62b':
  avopt: Check whether the object actually has got an AVClass

Conflicts:
libavutil/opt.c

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

Merge commit 'b7e6da988bfd5def40ccf3476eb8ce2f98a969a5'

* commit 'b7e6da988bfd5def40ccf3476eb8ce2f98a969a5':
  rtpproto: Move rtpproto specific function declarations to a separate header

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

Merge commit '892b0be1dfbdeaf71235fb6c593286e4f5c7e4ec'

* commit '892b0be1dfbdeaf71235fb6c593286e4f5c7e4ec':
  rtpproto: Simplify the rtp_read function by looping over the fds

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

Merge commit '7531588fffbca1f0afdcc06635999c00dfc16ca6'

* commit '7531588fffbca1f0afdcc06635999c00dfc16ca6':
  rtpproto: Remove a misplaced comment

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

Merge commit '54e03ff6af8a070f1055edd26028f3f7b2e2ca8e'

* commit '54e03ff6af8a070f1055edd26028f3f7b2e2ca8e':
  rtpproto: Support nonblocking reads

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

Merge commit '2e814d0329aded98c811d0502839618f08642685'

* commit '2e814d0329aded98c811d0502839618f08642685':
  rtpenc: Simplify code by introducing a macro for rescaling NTP timestamps

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

Merge commit '45dd1ae1b3c18331f3db2293a9135bc5851e553f'

* commit '45dd1ae1b3c18331f3db2293a9135bc5851e553f':
  avfilter: Add some missing FF_API_AVFILTERBUFFER ifdefs

Conflicts:
libavfilter/buffer.c
libavfilter/internal.h

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

avutil/tree: fix memleaks

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

Merge commit 'c2e936de07d054bf476e60445b453bf6b4836820'

* commit 'c2e936de07d054bf476e60445b453bf6b4836820':
  tree-test: Refactor and plug memory leaks

Conflicts:
libavutil/tree.c

Most of this commit is not merged due to bugs in it

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

rtsp: Simplify code for forming the remote peer url

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

Merge commit 'a9b04b2c43f95cc17c2291f83c27a3119471d986'

* commit 'a9b04b2c43f95cc17c2291f83c27a3119471d986':
  tree.h: K&R formatting and typo cosmetics

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

avframe: have av_frame_get_side_data take const AVFrame*

Signed-off-by: Anton Khirnov <anton@khirnov.net>

rtpproto: Allow specifying a separate rtcp port in ff_rtp_set_remote_url

A separate rtcp port can already be set when opening the rtp
protocol normally, but when doing port setup as in RTSP (where
we first need to open the local ports and pass them to the peer,
and only then receive the remote peer port numbers), we didn't
check the same url parameter as in the normal open routine.

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

rtpproto: Check the size before reading buf[1]

I doubt that anyone ever would try to send a 1 byte packet
via the RTP protocol, but check just in case - it shouldn't
crash at least.

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

doc/protocols: Document file protocol options

Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

lclenc: remove unused code

Signed-off-by: Paul B Mahol <onemda@gmail.com>

sunrastenc: do not set avctx->coded_frame

Signed-off-by: Paul B Mahol <onemda@gmail.com>

jv: make code independent of sizeof(AVFrame)

Signed-off-by: Paul B Mahol <onemda@gmail.com>

mss3: make code independent of sizeof(AVFrame)

Signed-off-by: Paul B Mahol <onemda@gmail.com>

mss2: make code independent of sizeof(AVFrame)

Signed-off-by: Paul B Mahol <onemda@gmail.com>

indeo2: make code independent of sizeof(AVFrame)

Signed-off-by: Paul B Mahol <onemda@gmail.com>

smacker: make code independent of sizeof(AVFrame)

Signed-off-by: Paul B Mahol <onemda@gmail.com>

avconv: add -n option to immediately exit when output files already exist

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

Document new 'blocksize' option of 'pipe' protocol

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

file: Add 'blocksize' option

Interruptibility of file operations is strongly desirable in case of
slow storage access, e.g. mounted network share.
This commit introduces possibility to limit data quantity transferred by
'file' protocol at once. By default, old behaviour is preserved and data
is still tried to be transferred without block size limitation.

Note that file I/O operation still may block (or even freeze) inside of
single read(2) or write(2) operation.

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

avconv: Call exit_program instead of exit in avconv_opt as well

This seems to have been missed in 636ced8e1dc.

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

avopt: Check whether the object actually has got an AVClass

AVIOContext has got an av_class member that only gets set if
opening the context using avio_open2, but not if allocating a
custom IO context. A caller that wants to read AVOptions from
an AVIOContext (recursively using AV_OPT_SEARCH_CHILDREN) may
not know if the AVIOContext actually has got a class set or not.

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

rtpproto: Move rtpproto specific function declarations to a separate header

Mixing these with the rtp depacketizer functions in rtpdec.h is
no good.

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

rtpproto: Simplify the rtp_read function by looping over the fds

This avoids having duplicate code where only the fd parameter
differs.

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

rtpproto: Remove a misplaced comment

The fdset is a pollfd array nowadays, and it is already populated
at this point.

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

rtpproto: Support nonblocking reads

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

rtpenc: Simplify code by introducing a macro for rescaling NTP timestamps

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

avfilter: Add some missing FF_API_AVFILTERBUFFER ifdefs

tree-test: Refactor and plug memory leaks

With the most annoying memory leak found by Derek Buitenhuis.

tree.h: K&R formatting and typo cosmetics

libxvid: Add SSIM displaying through a libxvidcore plugin

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

libxvid: add working lumimasking and variance AQ

The old implementation is unusable due to change in the Xvid API.

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  hls: Call avformat_find_stream_info() on the chained demuxers

Conflicts:
libavformat/hls.c

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

Support for shine 3.0.0

lavf/webvttenc: use proper printf format for int64_t values

Signed-off-by: Paul B Mahol <onemda@gmail.com>

avfilter/af_compand: %f is for printing doubles

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/get_bits: place volatile at the right spot

Should fix Ticket2825

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

avcodec/get_bits: init_state is used for thread sync, make it volatile

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

doc/encoders: add libxvid doc

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>

asfdec: Skip to keyframe after seeking

Fixes Ticket1616

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

avdevice/timefilter: cleanup the formating of the test output

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

avutil/pixfmt: dont refer to deprecated PIX_FMT in the documentation

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

avformat/gxfenc: replace deprecated PIX_FMT constants

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