ffmpeg.git
7 years agoavcodec/vdpau.h: define FF_API_CAP_VDPAU if its not defined
Michael Niedermayer [Tue, 6 Aug 2013 12:03:40 +0000 (14:03 +0200)]
avcodec/vdpau.h: define FF_API_CAP_VDPAU if its not defined

Prevent build failure for applicatins using the old API
This could be replaced be a include of version.h but some applications
would then need extern C wrapers

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '549294fbbe1c00fee37dc4d3f291b98945e11094'
Michael Niedermayer [Tue, 6 Aug 2013 11:54:05 +0000 (13:54 +0200)]
Merge commit '549294fbbe1c00fee37dc4d3f291b98945e11094'

* commit '549294fbbe1c00fee37dc4d3f291b98945e11094':
  vdpau: deprecate VDPAU codec capability

Conflicts:
libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'a0ad5d011318f951ecd4c9ffe1829518c9533909'
Michael Niedermayer [Tue, 6 Aug 2013 11:45:21 +0000 (13:45 +0200)]
Merge commit 'a0ad5d011318f951ecd4c9ffe1829518c9533909'

* commit 'a0ad5d011318f951ecd4c9ffe1829518c9533909':
  vdpau: deprecate old codec-specific pixel formats

Conflicts:
libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '578ea75a9e4ac56e0bbbbe668700be756aa699f8'
Michael Niedermayer [Tue, 6 Aug 2013 11:24:22 +0000 (13:24 +0200)]
Merge commit '578ea75a9e4ac56e0bbbbe668700be756aa699f8'

* commit '578ea75a9e4ac56e0bbbbe668700be756aa699f8':
  vdpau: remove old-style decoders

Conflicts:
libavcodec/allcodecs.c
libavcodec/h263dec.c
libavcodec/h264.c
libavcodec/mpeg12dec.c
libavcodec/mpeg4videodec.c
libavcodec/vc1dec.c
libavcodec/vdpau.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '488a0fa68973d48e264d54f1722f7afb18afbea7'
Michael Niedermayer [Tue, 6 Aug 2013 10:35:48 +0000 (12:35 +0200)]
Merge commit '488a0fa68973d48e264d54f1722f7afb18afbea7'

* commit '488a0fa68973d48e264d54f1722f7afb18afbea7':
  avconv: support -t as an input option.

Conflicts:
Changelog
ffmpeg.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffmpeg_opt: Remove support for specifying -t anywhere to set the duration
Michael Niedermayer [Tue, 6 Aug 2013 09:58:40 +0000 (11:58 +0200)]
ffmpeg_opt: Remove support for specifying -t anywhere to set the duration

This would otherwise conflict with the semantics of using -t for the input

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '811bd0784679dfcb4ed02043a37c92f9df10500e'
Michael Niedermayer [Tue, 6 Aug 2013 08:57:04 +0000 (10:57 +0200)]
Merge commit '811bd0784679dfcb4ed02043a37c92f9df10500e'

* commit '811bd0784679dfcb4ed02043a37c92f9df10500e':
  avconv: make input -ss accurate when transcoding

Conflicts:
Changelog
doc/ffmpeg.texi
ffmpeg.h
ffmpeg_filter.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '56ee3f9de7b9f6090d599a27d33a392890a2f7b8'
Michael Niedermayer [Tue, 6 Aug 2013 08:25:32 +0000 (10:25 +0200)]
Merge commit '56ee3f9de7b9f6090d599a27d33a392890a2f7b8'

* commit '56ee3f9de7b9f6090d599a27d33a392890a2f7b8':
  avconv: distinguish between -ss 0 and -ss not being used

Conflicts:
ffmpeg.c
ffmpeg_opt.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '2e661f26f8b12195f75ae3b07d9591e395135bc7'
Michael Niedermayer [Tue, 6 Aug 2013 08:08:17 +0000 (10:08 +0200)]
Merge commit '2e661f26f8b12195f75ae3b07d9591e395135bc7'

* commit '2e661f26f8b12195f75ae3b07d9591e395135bc7':
  avconv: insert extra filters in the same way for both graph inputs and outputs

Conflicts:
ffmpeg_filter.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '3799376dd3373ee255651ed542c75b15665801a8'
Michael Niedermayer [Tue, 6 Aug 2013 07:35:03 +0000 (09:35 +0200)]
Merge commit '3799376dd3373ee255651ed542c75b15665801a8'

* commit '3799376dd3373ee255651ed542c75b15665801a8':
  lavfi/fifo: fix flushing when using request_samples

Conflicts:
libavfilter/fifo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '06cd4c5a68e23f5be199c0d2d563da80989f839f'
Michael Niedermayer [Tue, 6 Aug 2013 07:20:05 +0000 (09:20 +0200)]
Merge commit '06cd4c5a68e23f5be199c0d2d563da80989f839f'

* commit '06cd4c5a68e23f5be199c0d2d563da80989f839f':
  avconv: fix usage of deprecated lavfi API

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '612a5049d9b4ac1c2a293daf75fe814b7a94fdc7'
Michael Niedermayer [Tue, 6 Aug 2013 07:05:13 +0000 (09:05 +0200)]
Merge commit '612a5049d9b4ac1c2a293daf75fe814b7a94fdc7'

* commit '612a5049d9b4ac1c2a293daf75fe814b7a94fdc7':
  avserver: do not use a static string as a default for a string option

See: 19c41c6d8ef6cc34cfde6bf877e059689e763bb7
Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agompegts: add fix_teletext_pts mpegts demuxer option
Marton Balint [Sun, 4 Aug 2013 02:17:22 +0000 (04:17 +0200)]
mpegts: add fix_teletext_pts mpegts demuxer option

Changes since v1 of the patch:
- enable option by default
- add documentation
- move up PTS override code after PES header parsing, to ensure we use the
  last PCR before the first packet of the teletext PES packet.

The option overrides teletext packet PTS and DTS values with the timestamps
calculated from the PCR of the first program which the teletext stream is part
of and is not discarded.

Using the same teletext PID for multiple programs is possible, therefore we
need some kind of heuristics to know which program PCR we should synchronize
to. Using the first non-discarded PCR pid among the programs of the teletext
stream seemed like a good choice.

The patch does not do PCR interpolation to estimate the PCR of the teltetext
packet, it just uses the last PCR of the program, which may cause a slight
error (0.1 sec) in the teletext packet pts-es.

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>
7 years agoSet bits_per_raw_sample when decoding pnm.
Carl Eugen Hoyos [Mon, 5 Aug 2013 22:26:21 +0000 (00:26 +0200)]
Set bits_per_raw_sample when decoding pnm.

7 years agortp: Make ff_rtp_codec_id() case insensitive
Wei-Cheng Pan [Mon, 5 Aug 2013 11:06:53 +0000 (19:06 +0800)]
rtp: Make ff_rtp_codec_id() case insensitive

Fixes handling of lower case pcmu

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolibxvid: Reduce the size of an array
Timothy Gu [Wed, 31 Jul 2013 02:42:32 +0000 (19:42 -0700)]
libxvid: Reduce the size of an array

It is not possible to have a plugin[] array with 5 or more elements.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec/libxvid: Partially check plugins array size with assert
Michael Niedermayer [Mon, 5 Aug 2013 13:01:20 +0000 (15:01 +0200)]
avcodec/libxvid: Partially check plugins array size with assert

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec/libxvid: set lumi_aq for lumimasking
Michael Niedermayer [Mon, 5 Aug 2013 13:00:14 +0000 (15:00 +0200)]
avcodec/libxvid: set lumi_aq for lumimasking

Simplifies check and should fix lumi+vari warning

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agovdpau: deprecate VDPAU codec capability
Rémi Denis-Courmont [Thu, 25 Jul 2013 19:30:19 +0000 (22:30 +0300)]
vdpau: deprecate VDPAU codec capability

Signed-off-by: Anton Khirnov <anton@khirnov.net>
7 years agovdpau: deprecate old codec-specific pixel formats
Rémi Denis-Courmont [Thu, 25 Jul 2013 19:30:18 +0000 (22:30 +0300)]
vdpau: deprecate old codec-specific pixel formats

Signed-off-by: Anton Khirnov <anton@khirnov.net>
7 years agovdpau: remove old-style decoders
Rémi Denis-Courmont [Thu, 25 Jul 2013 19:30:17 +0000 (22:30 +0300)]
vdpau: remove old-style decoders

Signed-off-by: Anton Khirnov <anton@khirnov.net>
7 years agoavconv: support -t as an input option.
Anton Khirnov [Tue, 18 Jun 2013 09:12:09 +0000 (11:12 +0200)]
avconv: support -t as an input option.

It limits the duration of the data read from a given input.

7 years agoavconv: make input -ss accurate when transcoding
Anton Khirnov [Sat, 15 Jun 2013 07:59:40 +0000 (09:59 +0200)]
avconv: make input -ss accurate when transcoding

Insert (a)trim filters on the corresponding inputs, so the extra frames
are decoded and discarded.

7 years agoavconv: distinguish between -ss 0 and -ss not being used
Anton Khirnov [Sat, 15 Jun 2013 07:35:10 +0000 (09:35 +0200)]
avconv: distinguish between -ss 0 and -ss not being used

Using -ss 0 to drop frames with negative timestamps is a perfectly valid
use case.

7 years agoavconv: insert extra filters in the same way for both graph inputs and outputs
Anton Khirnov [Fri, 14 Jun 2013 16:25:30 +0000 (18:25 +0200)]
avconv: insert extra filters in the same way for both graph inputs and outputs

This will allow using the same code when one filter can be inserted both
on input and output.

7 years agolavfi/fifo: fix flushing when using request_samples
Anton Khirnov [Sun, 4 Aug 2013 10:10:23 +0000 (12:10 +0200)]
lavfi/fifo: fix flushing when using request_samples

If any samples are still buffered when request_frame returns EOF, they
won't be returned currently.

7 years agoavconv: fix usage of deprecated lavfi API
Anton Khirnov [Sun, 4 Aug 2013 14:38:25 +0000 (16:38 +0200)]
avconv: fix usage of deprecated lavfi API

7 years agofate: Add vorbiscomment cover art test
James Almer [Fri, 26 Jul 2013 05:56:19 +0000 (02:56 -0300)]
fate: Add vorbiscomment cover art test

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec/tta: use init_get_bits8()
Michael Niedermayer [Mon, 5 Aug 2013 08:15:03 +0000 (10:15 +0200)]
avcodec/tta: use init_get_bits8()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavformat/takdec: use init_get_bits8()
Michael Niedermayer [Mon, 5 Aug 2013 08:14:42 +0000 (10:14 +0200)]
avformat/takdec: use init_get_bits8()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec/eatgq: use init_get_bits8()
Michael Niedermayer [Mon, 5 Aug 2013 08:14:14 +0000 (10:14 +0200)]
avcodec/eatgq: use init_get_bits8()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec/diracdec: use init_get_bits8()
Michael Niedermayer [Mon, 5 Aug 2013 08:13:48 +0000 (10:13 +0200)]
avcodec/diracdec: use init_get_bits8()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec/ra144dec: use init_get_bits8()
Michael Niedermayer [Mon, 5 Aug 2013 08:13:21 +0000 (10:13 +0200)]
avcodec/ra144dec: use init_get_bits8()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavformat/latmenc: use init_get_bits8()
Michael Niedermayer [Mon, 5 Aug 2013 08:12:46 +0000 (10:12 +0200)]
avformat/latmenc: use init_get_bits8()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 5 Aug 2013 07:57:07 +0000 (09:57 +0200)]
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>
7 years agoMerge commit 'a10c4ce24bd4a0dd557d5849aa53a0cc74677808'
Michael Niedermayer [Mon, 5 Aug 2013 07:52:06 +0000 (09:52 +0200)]
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>
7 years agoMerge commit '71953ebcf94fe4ef316cdad1f276089205dd1d65'
Michael Niedermayer [Mon, 5 Aug 2013 07:45:29 +0000 (09:45 +0200)]
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>
7 years agoMerge commit '51fc88e7467169031b20b9983d80456b893a9fa3'
Michael Niedermayer [Mon, 5 Aug 2013 07:32:31 +0000 (09:32 +0200)]
Merge commit '51fc88e7467169031b20b9983d80456b893a9fa3'

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

Conflicts:
ffmpeg_filter.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '77cc958f60f73963be4281d6e82ef81707e40c26'
Michael Niedermayer [Mon, 5 Aug 2013 07:21:53 +0000 (09:21 +0200)]
Merge commit '77cc958f60f73963be4281d6e82ef81707e40c26'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agordt: make const tables static const
Michael Niedermayer [Mon, 5 Aug 2013 00:53:16 +0000 (02:53 +0200)]
rdt: make const tables static const

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomp3dec: make const tables static const
Michael Niedermayer [Mon, 5 Aug 2013 00:52:41 +0000 (02:52 +0200)]
mp3dec: make const tables static const

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec/fft: Fix "warning: unused variable"
Michael Niedermayer [Sun, 4 Aug 2013 20:52:10 +0000 (22:52 +0200)]
avcodec/fft: Fix "warning: unused variable"

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavformat/matroskadec: make sipr_bit_rate static const
Michael Niedermayer [Sun, 4 Aug 2013 19:18:49 +0000 (21:18 +0200)]
avformat/matroskadec: make sipr_bit_rate static const

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavserver: do not use a static string as a default for a string option
Anton Khirnov [Sun, 4 Aug 2013 16:47:22 +0000 (18:47 +0200)]
avserver: do not use a static string as a default for a string option

Fixes an invalid free.

Bug-id: 448

7 years agomxfenc: switch to av_reallocp_array() and check allocation errors
Alexandra Khirnova [Fri, 2 Aug 2013 17:21:24 +0000 (19:21 +0200)]
mxfenc: switch to av_reallocp_array() and check allocation errors

Signed-off-by: Anton Khirnov <anton@khirnov.net>
7 years agoaac: Forward errors properly in aac_decode_frame_int
Luca Barbato [Sun, 4 Aug 2013 13:14:25 +0000 (15:14 +0200)]
aac: Forward errors properly in aac_decode_frame_int

Incidentally also remove a warning.

7 years agoaac: Check init_get_bits return value
Luca Barbato [Sun, 4 Aug 2013 13:00:02 +0000 (15:00 +0200)]
aac: Check init_get_bits return value

Some code paths can call it with invalid length.

CC: libav-stable@libav.org
7 years agoavconv: improve some variable names
Anton Khirnov [Fri, 14 Jun 2013 16:12:23 +0000 (18:12 +0200)]
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.

7 years agolavfi: add const to the AVFilter parameter of avfilter_graph_create_filter()
Anton Khirnov [Fri, 14 Jun 2013 16:14:33 +0000 (18:14 +0200)]
lavfi: add const to the AVFilter parameter of avfilter_graph_create_filter()

This function should never modify the filter.

7 years agolibavcodec: Implementation of 32 bit fixed point FFT
Nedeljko Babic [Mon, 3 Jun 2013 14:11:12 +0000 (16:11 +0200)]
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>
7 years agodoc/muxers: Document use case of mpegts muxer option tables_version
Andrey Utkin [Sun, 4 Aug 2013 09:25:57 +0000 (12:25 +0300)]
doc/muxers: Document use case of mpegts muxer option tables_version

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agovf_scale: add force_original_aspect_ratio
Timothy Gu [Sat, 3 Aug 2013 23:30:00 +0000 (16:30 -0700)]
vf_scale: add force_original_aspect_ratio

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMAINTAINERS: order libavutil entries alphabetically
Michael Niedermayer [Sun, 4 Aug 2013 09:24:57 +0000 (11:24 +0200)]
MAINTAINERS: order libavutil entries alphabetically

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavfilter/graphparser: remove 256 char limit from create_filter()
Michael Niedermayer [Sat, 3 Aug 2013 22:56:55 +0000 (00:56 +0200)]
avfilter/graphparser: remove 256 char limit from create_filter()

Fixes Ticket2803

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavdevice/vfwcap: make constant arrays static
Michael Niedermayer [Sat, 3 Aug 2013 20:24:31 +0000 (22:24 +0200)]
avdevice/vfwcap: make constant arrays static

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavdevice/dshow: make constant arrays static
Michael Niedermayer [Sat, 3 Aug 2013 20:24:11 +0000 (22:24 +0200)]
avdevice/dshow: make constant arrays static

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodoc/examples/filtering_audio: make const arrays also static
Michael Niedermayer [Sat, 3 Aug 2013 20:22:03 +0000 (22:22 +0200)]
doc/examples/filtering_audio: make const arrays also static

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodoc/muxers: Document previously undocumented mpegts muxer options
Andrey Utkin [Sat, 3 Aug 2013 14:59:25 +0000 (17:59 +0300)]
doc/muxers: Document previously undocumented mpegts muxer options

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavfilter: fix plane validity checks
Michael Niedermayer [Sat, 3 Aug 2013 16:54:43 +0000 (18:54 +0200)]
avfilter: fix plane validity checks

Fixes out of array accesses

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavdevice/timefilter: 2nd try at avoiding rounding issues
Michael Niedermayer [Sat, 3 Aug 2013 14:13:03 +0000 (16:13 +0200)]
avdevice/timefilter: 2nd try at avoiding rounding issues

This hopefully fixes fate-timefilter

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavdevice/timefilter-test: provide more space for the printout to allow larger values
Michael Niedermayer [Sat, 3 Aug 2013 14:09:51 +0000 (16:09 +0200)]
avdevice/timefilter-test: provide more space for the printout to allow larger values

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec/pnmdec: support more pnm files
Carl Eugen Hoyos [Sun, 28 Jul 2013 22:49:44 +0000 (00:49 +0200)]
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>
7 years agopnmdec: always output native pixel format
Michael Niedermayer [Sat, 3 Aug 2013 12:14:55 +0000 (14:14 +0200)]
pnmdec: always output native pixel format

This simplifies the code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agompegtsenc: add option tables_version
Andrey Utkin [Fri, 2 Aug 2013 19:08:05 +0000 (22:08 +0300)]
mpegtsenc: add option tables_version

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMAINTAINERS: add myself as maintainer for the interface code to swresample & swscale...
Michael Niedermayer [Sat, 3 Aug 2013 10:36:56 +0000 (12:36 +0200)]
MAINTAINERS: add myself as maintainer for the interface code to swresample & swscale in libavfilter

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 3 Aug 2013 08:53:44 +0000 (10:53 +0200)]
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>
7 years agoMerge commit 'a8b19271c3b40ac3c3dc769fe248887acf14ba5a'
Michael Niedermayer [Sat, 3 Aug 2013 08:48:11 +0000 (10:48 +0200)]
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>
7 years agoavcodec/mlp: Fix bugs in libavs warning fixes
Michael Niedermayer [Sat, 3 Aug 2013 08:27:42 +0000 (10:27 +0200)]
avcodec/mlp: Fix bugs in libavs warning fixes

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '7950e519bb094897f957b9a9531cc60ba46cbc91'
Michael Niedermayer [Sat, 3 Aug 2013 08:08:30 +0000 (10:08 +0200)]
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>
7 years agoconfigure: Check for GCC diagnostic pragma support inside of functions
Diego Biurrun [Fri, 2 Aug 2013 20:03:09 +0000 (22:03 +0200)]
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.

7 years agoMerge commit '3a7050ffed5ce061b114a11e4de4b77aba8efa0b'
Michael Niedermayer [Sat, 3 Aug 2013 07:27:37 +0000 (09:27 +0200)]
Merge commit '3a7050ffed5ce061b114a11e4de4b77aba8efa0b'

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

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '79be2c325c5ee8f7ac9e28399e51986ebe99bb3c'
Michael Niedermayer [Sat, 3 Aug 2013 07:22:24 +0000 (09:22 +0200)]
Merge commit '79be2c325c5ee8f7ac9e28399e51986ebe99bb3c'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'b5a138652ff8a5b987d3e1191e67fd9f6575527e'
Michael Niedermayer [Sat, 3 Aug 2013 07:16:36 +0000 (09:16 +0200)]
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>
7 years agoMerge commit '0d6fa3977b016f1b72b0b24b8834ff9222498548'
Michael Niedermayer [Sat, 3 Aug 2013 07:01:48 +0000 (09:01 +0200)]
Merge commit '0d6fa3977b016f1b72b0b24b8834ff9222498548'

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

Conflicts:
Changelog
libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '0d8b943d204bd16fcf2f4a59c742e65a401dd3d0'
Michael Niedermayer [Sat, 3 Aug 2013 06:54:54 +0000 (08:54 +0200)]
Merge commit '0d8b943d204bd16fcf2f4a59c742e65a401dd3d0'

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

Conflicts:
libavcodec/h264_sei.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Fri, 2 Aug 2013 22:45:02 +0000 (00:45 +0200)]
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>
7 years agoForward interlaced field information from mov to ffv1 decoder.
Tim.Nicholson [Fri, 2 Aug 2013 21:31:40 +0000 (23:31 +0200)]
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>
7 years agoDo not suggest to use gas-preprocessor if using it would break compilation.
Carl Eugen Hoyos [Fri, 2 Aug 2013 21:23:58 +0000 (23:23 +0200)]
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.

7 years agoavcodec/mdec: make block_index static const
Michael Niedermayer [Fri, 2 Aug 2013 21:12:26 +0000 (23:12 +0200)]
avcodec/mdec: make block_index static const

7 years agoavcodec/mjpeg: make 2 outcommented tables static
Michael Niedermayer [Fri, 2 Aug 2013 21:11:58 +0000 (23:11 +0200)]
avcodec/mjpeg: make 2 outcommented tables static

7 years agoavcodec/dxtory: make def_lru[8] static
Michael Niedermayer [Fri, 2 Aug 2013 21:11:31 +0000 (23:11 +0200)]
avcodec/dxtory: make def_lru[8] static

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec/dnxhdenc: make header_prefix static const
Michael Niedermayer [Fri, 2 Aug 2013 21:10:42 +0000 (23:10 +0200)]
avcodec/dnxhdenc: make header_prefix static const

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoconfigure: Check for GCC diagnostic pragma support inside of functions
Diego Biurrun [Fri, 2 Aug 2013 20:03:09 +0000 (22:03 +0200)]
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.

7 years agoavformat/matroskaenc: make 2 tables static that are not used outside matroskaenc
Michael Niedermayer [Fri, 2 Aug 2013 19:14:25 +0000 (21:14 +0200)]
avformat/matroskaenc: make 2 tables static that are not used outside matroskaenc

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomovenc: make uuids static const
Michael Niedermayer [Fri, 2 Aug 2013 19:09:54 +0000 (21:09 +0200)]
movenc: make uuids static const

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec: Add output_picture_number to AVCodecParserContext
Yusuke Nakamura [Fri, 2 Aug 2013 09:16:48 +0000 (18:16 +0900)]
avcodec: Add output_picture_number to AVCodecParserContext

Set output_picture_number in H.264 parser.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
7 years agoDisable deprecation warnings for cases where a replacement is available
Diego Biurrun [Wed, 27 Mar 2013 17:36:51 +0000 (18:36 +0100)]
Disable deprecation warnings for cases where a replacement is available

7 years agobuild: Add _Pragma macro to disable deprecated declaration warnings
Diego Biurrun [Wed, 27 Mar 2013 17:23:01 +0000 (18:23 +0100)]
build: Add _Pragma macro to disable deprecated declaration warnings

7 years agodoc/print_options: Move options headers to a saner place
Diego Biurrun [Thu, 1 Aug 2013 12:41:34 +0000 (14:41 +0200)]
doc/print_options: Move options headers to a saner place

7 years agoGive less generic names to global library option arrays
Diego Biurrun [Thu, 1 Aug 2013 12:35:01 +0000 (14:35 +0200)]
Give less generic names to global library option arrays

7 years agortmp: Add seek support
Gavriloaie Eugen-Andrei [Fri, 2 Aug 2013 09:29:23 +0000 (12:29 +0300)]
rtmp: Add seek support

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agottaenc: fix packet size
Paul B Mahol [Fri, 2 Aug 2013 16:45:58 +0000 (16:45 +0000)]
ttaenc: fix packet size

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoh264_sei: Return meaningful values
Vittorio Giovara [Fri, 2 Aug 2013 08:33:00 +0000 (10:33 +0200)]
h264_sei: Return meaningful values

Signed-off-by: Diego Biurrun <diego@biurrun.de>
7 years agoavdevice/timefilter-test: dont try to optimize par1 for n0=0 case
Michael Niedermayer [Fri, 2 Aug 2013 14:59:03 +0000 (16:59 +0200)]
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>
7 years agoflvdec: silence unused warning
Michael Niedermayer [Fri, 2 Aug 2013 11:05:16 +0000 (13:05 +0200)]
flvdec: silence unused warning

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 2 Aug 2013 10:37:37 +0000 (12:37 +0200)]
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>
7 years agoMerge commit '4c7fd58f8ae729b964b6859eace5ab9a55ce3c8c'
Michael Niedermayer [Fri, 2 Aug 2013 10:23:47 +0000 (12:23 +0200)]
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>
7 years agoMerge commit 'f900f35ac8db4ac30df6fda1c27502c2ef9e6ba5'
Michael Niedermayer [Fri, 2 Aug 2013 10:18:48 +0000 (12:18 +0200)]
Merge commit 'f900f35ac8db4ac30df6fda1c27502c2ef9e6ba5'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'e4529df944616917ae8462f5102253ff7f983093'
Michael Niedermayer [Fri, 2 Aug 2013 10:07:20 +0000 (12:07 +0200)]
Merge commit 'e4529df944616917ae8462f5102253ff7f983093'

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

Conflicts:
libavformat/flvdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '390b4d7088b5cecace245fee0c54a57e24dabdf4'
Michael Niedermayer [Fri, 2 Aug 2013 08:45:10 +0000 (10:45 +0200)]
Merge commit '390b4d7088b5cecace245fee0c54a57e24dabdf4'

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

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