avcodec/eatgq: use init_get_bits8()

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

avcodec/diracdec: use init_get_bits8()

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

avcodec/ra144dec: use init_get_bits8()

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

avformat/latmenc: use init_get_bits8()

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  mxfenc: switch to av_reallocp_array() and check allocation errors

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

Merge commit 'a10c4ce24bd4a0dd557d5849aa53a0cc74677808'

* commit 'a10c4ce24bd4a0dd557d5849aa53a0cc74677808':
  aac: Forward errors properly in aac_decode_frame_int

Conflicts:
libavcodec/aacdec.c

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

Merge commit '71953ebcf94fe4ef316cdad1f276089205dd1d65'

* commit '71953ebcf94fe4ef316cdad1f276089205dd1d65':
  aac: Check init_get_bits return value

Conflicts:
libavcodec/aacdec.c

See: 73abc3a634d84e4cc8951787323b594c5476e4a8

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

Merge commit '51fc88e7467169031b20b9983d80456b893a9fa3'

* commit '51fc88e7467169031b20b9983d80456b893a9fa3':
  avconv: improve some variable names

Conflicts:
ffmpeg_filter.c

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

Merge commit '77cc958f60f73963be4281d6e82ef81707e40c26'

* commit '77cc958f60f73963be4281d6e82ef81707e40c26':
  lavfi: add const to the AVFilter parameter of avfilter_graph_create_filter()

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

rdt: make const tables static const

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

mp3dec: make const tables static const

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

avcodec/fft: Fix "warning: unused variable"

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

avformat/matroskadec: make sipr_bit_rate static const

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

mxfenc: switch to av_reallocp_array() and check allocation errors

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

aac: Forward errors properly in aac_decode_frame_int

Incidentally also remove a warning.

aac: Check init_get_bits return value

Some code paths can call it with invalid length.

CC: libav-stable@libav.org

avconv: improve some variable names

'filter' is too generic, since the functions in question deal with
several filters.

Also add const qualifiers to those variables.

lavfi: add const to the AVFilter parameter of avfilter_graph_create_filter()

This function should never modify the filter.

libavcodec: Implementation of 32 bit fixed point FFT

Iterative implementation of 32 bit fixed point split-radix FFT.
Max FFT that can be calculated currently is 2^12.

Signed-off-by: Nedeljko Babic <nbabic@mips.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

doc/muxers: Document use case of mpegts muxer option tables_version

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

vf_scale: add force_original_aspect_ratio

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

MAINTAINERS: order libavutil entries alphabetically

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

avfilter/graphparser: remove 256 char limit from create_filter()

Fixes Ticket2803

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

avdevice/vfwcap: make constant arrays static

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

avdevice/dshow: make constant arrays static

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

doc/examples/filtering_audio: make const arrays also static

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

doc/muxers: Document previously undocumented mpegts muxer options

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

avfilter: fix plane validity checks

Fixes out of array accesses

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

avdevice/timefilter: 2nd try at avoiding rounding issues

This hopefully fixes fate-timefilter

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

avdevice/timefilter-test: provide more space for the printout to allow larger values

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

avcodec/pnmdec: support more pnm files

Fixes Ticket1897

Some hunks that have become unneeded due to previous changes removed by the commiter.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

pnmdec: always output native pixel format

This simplifies the code

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

mpegtsenc: add option tables_version

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

MAINTAINERS: add myself as maintainer for the interface code to swresample & swscale in libavfilter

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  configure: Check for GCC diagnostic pragma support inside of functions

This commit was cherry picked previously already to prevent compilation failure on a previous merge
See: 038c4f65ee6c72f9d1ee4d4e46c74073992fabc8

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

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>

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.

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>