ffmpeg.git
5 years agoffmpeg: treat avi as VFR in framerate conversion code
Michael Niedermayer [Fri, 8 Nov 2013 23:03:27 +0000 (00:03 +0100)]
ffmpeg: treat avi as VFR in framerate conversion code

It can be debated if avi is vfr or cfr, it can be either depending
on the definition of vfr and cfr.
This commit ensures that avi is treated correctly independent of
the AVFMT_VARIABLE_FPS value.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '5462dde1947e0ecfcb2db99ae29ce9dee8933b45'
Michael Niedermayer [Fri, 8 Nov 2013 22:36:59 +0000 (23:36 +0100)]
Merge commit '5462dde1947e0ecfcb2db99ae29ce9dee8933b45'

* commit '5462dde1947e0ecfcb2db99ae29ce9dee8933b45':
  metasound: Fix error message argument

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/mxfdec: optimize probing
Michael Niedermayer [Fri, 8 Nov 2013 20:43:27 +0000 (21:43 +0100)]
avformat/mxfdec: optimize probing

about 71 times faster

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agotools/probetest: also print the time the probe functions needed
Michael Niedermayer [Fri, 8 Nov 2013 20:15:24 +0000 (21:15 +0100)]
tools/probetest: also print the time the probe functions needed

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agotools/probetest: use named constant for the maximum number of formats
Michael Niedermayer [Fri, 8 Nov 2013 19:42:13 +0000 (20:42 +0100)]
tools/probetest: use named constant for the maximum number of formats

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mimic: use av_freep() and reset swap_buf_size
Paul B Mahol [Fri, 8 Nov 2013 14:23:45 +0000 (14:23 +0000)]
avcodec/mimic: use av_freep() and reset swap_buf_size

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agoavcodec/vmdav: use av_freep() and reset unpack_buffer_size
Paul B Mahol [Fri, 8 Nov 2013 14:15:31 +0000 (14:15 +0000)]
avcodec/vmdav: use av_freep() and reset unpack_buffer_size

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agoavformat/icodec: reduce score returned on probing
Michael Niedermayer [Fri, 8 Nov 2013 19:10:33 +0000 (20:10 +0100)]
avformat/icodec: reduce score returned on probing

The ico probe function is pretty weak just checking a few bytes for being 0, 1 or not 0

Fixes probetest failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 8 Nov 2013 17:00:56 +0000 (18:00 +0100)]
Merge remote-tracking branch 'qatar/master'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '0338c396987c82b41d322630ea9712fe5f9561d6'
Michael Niedermayer [Fri, 8 Nov 2013 16:25:13 +0000 (17:25 +0100)]
Merge commit '0338c396987c82b41d322630ea9712fe5f9561d6'

* commit '0338c396987c82b41d322630ea9712fe5f9561d6':
  dsputil: Split off H.263 bits into their own H263DSPContext

Conflicts:
configure
libavcodec/mpegvideo.h
libavcodec/mpegvideo_enc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/lvfdec: check stream count during probing
Michael Niedermayer [Fri, 8 Nov 2013 16:03:42 +0000 (17:03 +0100)]
avformat/lvfdec: check stream count during probing

Fixes probetest failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agometasound: Fix error message argument
Kostya Shishkov [Fri, 8 Nov 2013 09:21:07 +0000 (10:21 +0100)]
metasound: Fix error message argument

Signed-off-by: Diego Biurrun <diego@biurrun.de>
5 years agoavformat/idcin: check the decompressed frame size during probing
Michael Niedermayer [Fri, 8 Nov 2013 14:03:21 +0000 (15:03 +0100)]
avformat/idcin: check the decompressed frame size during probing

Fixes probetest failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoh263dsp: K&R formatting cosmetics
Diego Biurrun [Fri, 8 Nov 2013 02:06:09 +0000 (03:06 +0100)]
h263dsp: K&R formatting cosmetics

Also remove array element numbering comments.

5 years agodsputil: Split off H.263 bits into their own H263DSPContext
Diego Biurrun [Tue, 5 Nov 2013 07:11:47 +0000 (08:11 +0100)]
dsputil: Split off H.263 bits into their own H263DSPContext

5 years agoavformat/mov: only force parsing for video tracks if stss is empty
Hendrik Leppkes [Mon, 4 Nov 2013 15:22:27 +0000 (16:22 +0100)]
avformat/mov: only force parsing for video tracks if stss is empty

Fixes playback of some AAC streams, which are otherwise mangled by the
parser, and stss is typically only valid for video anyway.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolibavcodec/dvdsubdec: remove exit() call in debug code
Michael Niedermayer [Thu, 7 Nov 2013 23:31:24 +0000 (00:31 +0100)]
libavcodec/dvdsubdec: remove exit() call in debug code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 7 Nov 2013 22:39:23 +0000 (23:39 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  Remove #undefs for formerly forbidden system functions

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/graphparser: zero filter_ctx in case of deallocation in create_filter()
Michael Niedermayer [Thu, 7 Nov 2013 22:38:44 +0000 (23:38 +0100)]
avfilter/graphparser: zero filter_ctx in case of deallocation in create_filter()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'cffecc0e7ebd642afaa1fb9f56fab1fcc283293c'
Michael Niedermayer [Thu, 7 Nov 2013 22:05:26 +0000 (23:05 +0100)]
Merge commit 'cffecc0e7ebd642afaa1fb9f56fab1fcc283293c'

* commit 'cffecc0e7ebd642afaa1fb9f56fab1fcc283293c':
  avfilter/graphparser: Directly free filter memory if initialization fails

Conflicts:
libavfilter/graphparser.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/unsharp: added optimized opencl kernels
Lenny Wang [Thu, 7 Nov 2013 21:15:49 +0000 (15:15 -0600)]
avfilter/unsharp: added optimized opencl kernels

Reviewed-by: Wei Gao <highgod0401@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoFix compilation with os2threads
Dave Yeo [Thu, 7 Nov 2013 19:10:20 +0000 (11:10 -0800)]
Fix compilation with os2threads

Signed-off-by: Dave Yeo <daveryeo@telus.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/mpegvideodec: check seq headers more completely during probing
Michael Niedermayer [Thu, 7 Nov 2013 17:39:23 +0000 (18:39 +0100)]
avformat/mpegvideodec: check seq headers more completely during probing

Fixes probetest failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/img2enc: simplify split planes extension selection.
Clément Bœsch [Thu, 7 Nov 2013 19:28:44 +0000 (20:28 +0100)]
avformat/img2enc: simplify split planes extension selection.

5 years agodoc/muxers: document animated GIF muxer.
Clément Bœsch [Sat, 19 Oct 2013 18:39:30 +0000 (20:39 +0200)]
doc/muxers: document animated GIF muxer.

5 years agoavformat/gif: fix final_delay unit in documentation.
Clément Bœsch [Sat, 19 Oct 2013 18:24:58 +0000 (20:24 +0200)]
avformat/gif: fix final_delay unit in documentation.

5 years agoavformat/img2enc: reindent after previous commit.
Clément Bœsch [Thu, 7 Nov 2013 19:22:25 +0000 (20:22 +0100)]
avformat/img2enc: reindent after previous commit.

5 years agoavformat/image2: allow muxing gif files.
Clément Bœsch [Sat, 19 Oct 2013 17:39:28 +0000 (19:39 +0200)]
avformat/image2: allow muxing gif files.

Fixes Ticket #2936.

5 years agoavfilter/af_aecho: free input frame after it is being used
Paul B Mahol [Thu, 7 Nov 2013 17:45:47 +0000 (17:45 +0000)]
avfilter/af_aecho: free input frame after it is being used

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agoavcodec/libfdk-aacdec: remove redundant log messages
Paul B Mahol [Thu, 7 Nov 2013 14:55:35 +0000 (14:55 +0000)]
avcodec/libfdk-aacdec: remove redundant log messages

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agoavcodec/hnm4video: remove redundant log message
Paul B Mahol [Thu, 7 Nov 2013 14:04:21 +0000 (14:04 +0000)]
avcodec/hnm4video: remove redundant log message

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agoavformat/astdec: sanity check channels & sample rate
Michael Niedermayer [Wed, 6 Nov 2013 12:12:59 +0000 (13:12 +0100)]
avformat/astdec: sanity check channels & sample rate

Fixes probetest failure

Reviewed-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/hls: fixed bug where custom http headers weren't kept for hls streams
kowalsky [Wed, 6 Nov 2013 20:01:57 +0000 (21:01 +0100)]
avformat/hls: fixed bug where custom http headers weren't kept for hls streams

See: https://trac.ffmpeg.org/ticket/3024

5 years agoRemove #undefs for formerly forbidden system functions
Diego Biurrun [Wed, 6 Nov 2013 20:07:35 +0000 (21:07 +0100)]
Remove #undefs for formerly forbidden system functions

The macros forbidding the system functions no longer exist, obviating
the need for the #undefs.

5 years agoavfilter/af_aresample: Calculate output buffer size more precisely.
Michael Niedermayer [Wed, 6 Nov 2013 21:59:16 +0000 (22:59 +0100)]
avfilter/af_aresample: Calculate output buffer size more precisely.

Fixes accumulation of data in case of significant silence injections

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/graphparser: Directly free filter memory if initialization fails
Diego Biurrun [Wed, 6 Nov 2013 21:06:15 +0000 (22:06 +0100)]
avfilter/graphparser: Directly free filter memory if initialization fails

5 years agoavformat/segafilm: check 2nd tag
Michael Niedermayer [Wed, 6 Nov 2013 11:56:42 +0000 (12:56 +0100)]
avformat/segafilm: check 2nd tag

Fixes probetest failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/swfdec: check version and size during probing
Michael Niedermayer [Wed, 6 Nov 2013 11:44:02 +0000 (12:44 +0100)]
avformat/swfdec: check version and size during probing

Fixes probetest failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/rsd: increase probe score, as misdetections are fixed
Michael Niedermayer [Wed, 6 Nov 2013 10:51:16 +0000 (11:51 +0100)]
avformat/rsd: increase probe score, as misdetections are fixed

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/rsd: Check channels and sample_rate fields
Michael Niedermayer [Wed, 6 Nov 2013 10:48:49 +0000 (11:48 +0100)]
avformat/rsd: Check channels and sample_rate fields

Fixes probetest failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/libgme: decrease score by 1, fixes probetest failure
Michael Niedermayer [Wed, 6 Nov 2013 10:33:12 +0000 (11:33 +0100)]
avformat/libgme: decrease score by 1, fixes probetest failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'cus/stable'
Michael Niedermayer [Wed, 6 Nov 2013 09:58:58 +0000 (10:58 +0100)]
Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffplay: add smarter method for determining video picture duration
  ffplay: add frame duration estimated from frame rate to VideoPicture
  ffplay: avoid code duplication in AVFILTER enabled and disabled case

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavutil/common: error out with clear message if __STDC_CONSTANT_MACROS is not defined...
Michael Niedermayer [Tue, 5 Nov 2013 10:49:09 +0000 (11:49 +0100)]
avutil/common: error out with clear message if __STDC_CONSTANT_MACROS is not defined with c++

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 5 Nov 2013 20:58:26 +0000 (21:58 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  configure: Move -Wno-maybe-uninitialized check into gcc section

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoffplay: add smarter method for determining video picture duration
Marton Balint [Sat, 2 Feb 2013 11:37:29 +0000 (12:37 +0100)]
ffplay: add smarter method for determining video picture duration

- consider it an invalid PTS when the next PTS value is the same as the current one
- in case of invalid or unknown PTS, return vp->duration

This fixes ffplay part of ticket #3005.

Signed-off-by: Marton Balint <cus@passwd.hu>
5 years agoffplay: add frame duration estimated from frame rate to VideoPicture
Marton Balint [Sun, 27 Oct 2013 14:55:42 +0000 (15:55 +0100)]
ffplay: add frame duration estimated from frame rate to VideoPicture

Signed-off-by: Marton Balint <cus@passwd.hu>
5 years agoffplay: avoid code duplication in AVFILTER enabled and disabled case
Marton Balint [Sun, 27 Oct 2013 14:51:41 +0000 (15:51 +0100)]
ffplay: avoid code duplication in AVFILTER enabled and disabled case

Signed-off-by: Marton Balint <cus@passwd.hu>
5 years agoavcodec/vp9: add ff_vp9_idct_idct_{4x4,8x8}_ssse3().
Clément Bœsch [Sun, 3 Nov 2013 17:17:36 +0000 (18:17 +0100)]
avcodec/vp9: add ff_vp9_idct_idct_{4x4,8x8}_ssse3().

1789 decicycles in idct_idct_4x4_add_c, 262136 runs, 8 skips
1839 decicycles in idct_idct_4x4_add_c, 524270 runs, 18 skips
1864 decicycles in idct_idct_4x4_add_c, 1048548 runs, 28 skips

529 decicycles in ff_vp9_idct_idct_4x4_add_ssse3, 262138 runs, 6 skips
516 decicycles in ff_vp9_idct_idct_4x4_add_ssse3, 524282 runs, 6 skips
474 decicycles in ff_vp9_idct_idct_4x4_add_ssse3, 1048565 runs, 11 skips

(~3.9x faster)

7726 decicycles in idct_idct_8x8_add_c, 1048433 runs, 143 skips
7732 decicycles in idct_idct_8x8_add_c, 2096882 runs, 270 skips
7731 decicycles in idct_idct_8x8_add_c, 4193772 runs, 532 skips

1145 decicycles in ff_vp9_idct_idct_8x8_add_ssse3, 1048549 runs, 27 skips
1137 decicycles in ff_vp9_idct_idct_8x8_add_ssse3, 2097097 runs, 55 skips
1086 decicycles in ff_vp9_idct_idct_8x8_add_ssse3, 4194188 runs, 116 skips

(~7.1x faster)

Overall decode time before commit:
  16.48s user 0.03s system 99% cpu 16.526 total
  16.54s user 0.01s system 99% cpu 16.566 total
  16.46s user 0.03s system 99% cpu 16.511 total

Overall decode time after commit:
  16.34s user 0.02s system 99% cpu 16.378 total
  16.28s user 0.02s system 99% cpu 16.315 total
  16.32s user 0.03s system 99% cpu 16.366 total

Tested on i7 920 with 40s 1080p footage.

5 years agoavfilter/opencl: compile kernels separately
Lenny Wang [Mon, 4 Nov 2013 03:58:09 +0000 (21:58 -0600)]
avfilter/opencl: compile kernels separately

Reviewed-by: Wei Gao <highgod0401@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavutil/opencl: compile kernels separately
Lenny Wang [Mon, 4 Nov 2013 03:58:09 +0000 (21:58 -0600)]
avutil/opencl: compile kernels separately

Reviewed-by: Wei Gao <highgod0401@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mss2: use init_get_bits8()
Paul B Mahol [Tue, 5 Nov 2013 13:10:07 +0000 (13:10 +0000)]
avcodec/mss2: use init_get_bits8()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agoavcodec/flashsv: use av_freep() for tmpblock
Paul B Mahol [Tue, 5 Nov 2013 12:56:59 +0000 (12:56 +0000)]
avcodec/flashsv: use av_freep() for tmpblock

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agoavcodec/mss1: use init_get_bits8()
Paul B Mahol [Tue, 5 Nov 2013 12:50:43 +0000 (12:50 +0000)]
avcodec/mss1: use init_get_bits8()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agolsws/utils: introduce scale_algorithms array
Stefano Sabatini [Mon, 4 Nov 2013 23:01:59 +0000 (00:01 +0100)]
lsws/utils: introduce scale_algorithms array

Allow some dumb factorizations, slightly decrease spaghetti factor.

5 years agoavcodec/flashsv: fix typo
Paul B Mahol [Tue, 5 Nov 2013 12:44:52 +0000 (12:44 +0000)]
avcodec/flashsv: fix typo

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agoavcodec/tscc2: use init_get_bits8()
Paul B Mahol [Tue, 5 Nov 2013 12:44:20 +0000 (12:44 +0000)]
avcodec/tscc2: use init_get_bits8()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agoavcodec/brender_pix: stop calling av_image_check_size() twice
Paul B Mahol [Tue, 5 Nov 2013 12:37:52 +0000 (12:37 +0000)]
avcodec/brender_pix: stop calling av_image_check_size() twice

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agoavcodec/flashsv: stop using deprecated avcodec_set_dimensions
Paul B Mahol [Tue, 5 Nov 2013 12:36:24 +0000 (12:36 +0000)]
avcodec/flashsv: stop using deprecated avcodec_set_dimensions

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agoavcodec/flashsv: use init_get_bits8()
Paul B Mahol [Tue, 5 Nov 2013 12:31:18 +0000 (12:31 +0000)]
avcodec/flashsv: use init_get_bits8()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agoavcodec/brender_pix: stop using deprecated avcodec_set_dimensions
Paul B Mahol [Tue, 5 Nov 2013 12:26:58 +0000 (12:26 +0000)]
avcodec/brender_pix: stop using deprecated avcodec_set_dimensions

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agoavcodec/c93: stop using deprecated avcodec_set_dimensions
Paul B Mahol [Tue, 5 Nov 2013 12:24:39 +0000 (12:24 +0000)]
avcodec/c93: stop using deprecated avcodec_set_dimensions

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agoconfigure: Move -Wno-maybe-uninitialized check into gcc section
Diego Biurrun [Sat, 2 Nov 2013 11:16:00 +0000 (12:16 +0100)]
configure: Move -Wno-maybe-uninitialized check into gcc section

As another example of bizarre compiler behavior clang groks the
-Wmaybe-uninitialized option, but not -Wno-maybe-uninitialized
and spews a warning for every file that gets compiled.

5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 5 Nov 2013 11:17:35 +0000 (12:17 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  avfilter/buffer: Suppress deprecation warning for avfilter_unref_buffer

Conflicts:
libavfilter/buffer.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '82c86d0b1839b01b3cd0dd848fb6416ff21506dd'
Michael Niedermayer [Tue, 5 Nov 2013 11:13:36 +0000 (12:13 +0100)]
Merge commit '82c86d0b1839b01b3cd0dd848fb6416ff21506dd'

* commit '82c86d0b1839b01b3cd0dd848fb6416ff21506dd':
  graph2dot: Add missing #include for av_get_channel_layout_string()

See: 1acd2f6ba7bc85d4aab6f0ebdc56c8d21785640e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '48715285f69d70879353737d7bed049f89f58096'
Michael Niedermayer [Tue, 5 Nov 2013 11:04:39 +0000 (12:04 +0100)]
Merge commit '48715285f69d70879353737d7bed049f89f58096'

* commit '48715285f69d70879353737d7bed049f89f58096':
  graph2dot: Fix use of deprecated API

See: 59360cd456dd038fb28134aff5d9b56302fff488
See: ecade984ac3ce5205f6276a9329e2b7bca09fa47
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '70cbf33405f50dfaf77e85f382a188acf17dc71a'
Michael Niedermayer [Tue, 5 Nov 2013 09:32:10 +0000 (10:32 +0100)]
Merge commit '70cbf33405f50dfaf77e85f382a188acf17dc71a'

* commit '70cbf33405f50dfaf77e85f382a188acf17dc71a':
  vdpau: Add missing #includes to fix standalone header compilation

Conflicts:
libavcodec/vdpau_internal.h

Not completely merged as this would break use of vdpau.h from C++

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'e2b5b097898c9155f4bdff4d83cdc54d5eef6930'
Michael Niedermayer [Tue, 5 Nov 2013 09:25:53 +0000 (10:25 +0100)]
Merge commit 'e2b5b097898c9155f4bdff4d83cdc54d5eef6930'

* commit 'e2b5b097898c9155f4bdff4d83cdc54d5eef6930':
  x86: rv40dsp: Use PAVGB instruction macro where appropriate

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/http: print http headers at AV_LOG_DEBUG level
Michael Niedermayer [Mon, 4 Nov 2013 14:59:19 +0000 (15:59 +0100)]
avformat/http: print http headers at AV_LOG_DEBUG level

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolsws/utils: fix typo
Stefano Sabatini [Mon, 4 Nov 2013 22:42:44 +0000 (23:42 +0100)]
lsws/utils: fix typo

5 years agolavfi/ladspa: cast return value of av_x_if_null to char*, fix warnings
Stefano Sabatini [Mon, 4 Nov 2013 12:03:56 +0000 (13:03 +0100)]
lavfi/ladspa: cast return value of av_x_if_null to char*, fix warnings

5 years agoavfilter/buffer: Suppress deprecation warning for avfilter_unref_buffer
Diego Biurrun [Mon, 4 Nov 2013 11:53:07 +0000 (12:53 +0100)]
avfilter/buffer: Suppress deprecation warning for avfilter_unref_buffer

The function is used in a block of code that is deprecated anyway.

5 years agograph2dot: Add missing #include for av_get_channel_layout_string()
Diego Biurrun [Mon, 4 Nov 2013 21:33:16 +0000 (22:33 +0100)]
graph2dot: Add missing #include for av_get_channel_layout_string()

5 years agograph2dot: Fix use of deprecated API
Diego Biurrun [Mon, 4 Nov 2013 16:35:38 +0000 (17:35 +0100)]
graph2dot: Fix use of deprecated API

5 years agovdpau: Add missing #includes to fix standalone header compilation
Diego Biurrun [Mon, 4 Nov 2013 17:16:46 +0000 (18:16 +0100)]
vdpau: Add missing #includes to fix standalone header compilation

Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 4 Nov 2013 21:19:51 +0000 (22:19 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  omadec: loosen format probing constraints

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '1c736bedd9891501960ebac0f7c05eb60225e947'
Michael Niedermayer [Mon, 4 Nov 2013 21:02:02 +0000 (22:02 +0100)]
Merge commit '1c736bedd9891501960ebac0f7c05eb60225e947'

* commit '1c736bedd9891501960ebac0f7c05eb60225e947':
  omadec: check GEOB sizes against buffer size

Conflicts:
libavformat/omadec.c

See: e74fa25cb9f29aee8a36df0c8e492f8bafdbe4a0
See: 91e72e35141f590c38985ad0ae3453a4e9e86b8a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '97f50e92b5cf3b47a76f75d76ed4340e822030db'
Michael Niedermayer [Mon, 4 Nov 2013 20:59:21 +0000 (21:59 +0100)]
Merge commit '97f50e92b5cf3b47a76f75d76ed4340e822030db'

* commit '97f50e92b5cf3b47a76f75d76ed4340e822030db':
  omadec: Fix wrong number of array elements

See: 4f5d1468f55eb87bce84845c4e62242c791268f5
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'e73996954d8e00117056dcefb38ef3d4d2f37967'
Michael Niedermayer [Mon, 4 Nov 2013 20:52:46 +0000 (21:52 +0100)]
Merge commit 'e73996954d8e00117056dcefb38ef3d4d2f37967'

* commit 'e73996954d8e00117056dcefb38ef3d4d2f37967':
  filtfmts-test: Fix use of deprecated API

Conflicts:
libavfilter/filtfmts.c

See: f12174c8cef872030a156cbf252f4951c3a6357c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '3ef9b7ab95cc703b67a8b658dca45c80df0aaa66'
Michael Niedermayer [Mon, 4 Nov 2013 20:43:07 +0000 (21:43 +0100)]
Merge commit '3ef9b7ab95cc703b67a8b658dca45c80df0aaa66'

* commit '3ef9b7ab95cc703b67a8b658dca45c80df0aaa66':
  hevc_ps: Use AV_PIX_FMT_YUVJ420P if YUV 4:2:0 8-bit full scale

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '885ec9242554ad25922258a595ec5e317922a412'
Michael Niedermayer [Mon, 4 Nov 2013 20:37:18 +0000 (21:37 +0100)]
Merge commit '885ec9242554ad25922258a595ec5e317922a412'

* commit '885ec9242554ad25922258a595ec5e317922a412':
  hevc: Use parsed VUI colorimetry in avcodec

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'cd8f772d0678a90957f4dfd5ce51af9d22e3f212'
Michael Niedermayer [Mon, 4 Nov 2013 20:25:36 +0000 (21:25 +0100)]
Merge commit 'cd8f772d0678a90957f4dfd5ce51af9d22e3f212'

* commit 'cd8f772d0678a90957f4dfd5ce51af9d22e3f212':
  lavc: Add colorimetry values for BT.2020, other non-included ones

Conflicts:
doc/APIchanges
libavcodec/avcodec.h
libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '446e37dc97e533e37f6aa0a11355124207e3a7f7'
Michael Niedermayer [Mon, 4 Nov 2013 20:01:58 +0000 (21:01 +0100)]
Merge commit '446e37dc97e533e37f6aa0a11355124207e3a7f7'

* commit '446e37dc97e533e37f6aa0a11355124207e3a7f7':
  vf_fieldorder: remove superfluous get_video_buffer

Conflicts:
libavfilter/vf_fieldorder.c

See: 9b35bee696739eb6774bdba30504c51132e2a934
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agox86: rv40dsp: Use PAVGB instruction macro where appropriate
Diego Biurrun [Sun, 3 Nov 2013 20:28:45 +0000 (21:28 +0100)]
x86: rv40dsp: Use PAVGB instruction macro where appropriate

5 years agoomadec: loosen format probing constraints
David Goldwich [Thu, 24 Oct 2013 13:24:26 +0000 (15:24 +0200)]
omadec: loosen format probing constraints

Imporoves detection of some files in the wild:

- ID3v2 a.k.a. "ea3" header is optional.
- Version and flags in ID3v2 header are unspecified.

Signed-off-by: David Goldwich <david.goldwich@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agoomadec: check GEOB sizes against buffer size
Michael Niedermayer [Thu, 24 Oct 2013 13:24:25 +0000 (15:24 +0200)]
omadec: check GEOB sizes against buffer size

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: David Goldwich <david.goldwich@gmail.com>
CC:libav-stable@libav.org
Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agoomadec: Fix wrong number of array elements
Michael Niedermayer [Thu, 24 Oct 2013 13:24:24 +0000 (15:24 +0200)]
omadec: Fix wrong number of array elements

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: David Goldwich <david.goldwich@gmail.com>
CC:libav-stable@libav.org
Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agofiltfmts-test: Fix use of deprecated API
Diego Biurrun [Mon, 4 Nov 2013 13:56:28 +0000 (13:56 +0000)]
filtfmts-test: Fix use of deprecated API

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
5 years agohevc_ps: Use AV_PIX_FMT_YUVJ420P if YUV 4:2:0 8-bit full scale
Yusuke Nakamura [Sun, 3 Nov 2013 18:47:31 +0000 (18:47 +0000)]
hevc_ps: Use AV_PIX_FMT_YUVJ420P if YUV 4:2:0 8-bit full scale

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
5 years agohevc: Use parsed VUI colorimetry in avcodec
Jan Ekström [Sun, 3 Nov 2013 19:45:02 +0000 (19:45 +0000)]
hevc: Use parsed VUI colorimetry in avcodec

Also limit the parsed VUI values to known valid ones.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
5 years agolavc: Add colorimetry values for BT.2020, other non-included ones
Jan Ekström [Mon, 4 Nov 2013 10:28:39 +0000 (10:28 +0000)]
lavc: Add colorimetry values for BT.2020, other non-included ones

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
5 years agoavutil: add av_fopen_utf8()
Michael Niedermayer [Fri, 1 Nov 2013 00:51:14 +0000 (01:51 +0100)]
avutil: add av_fopen_utf8()

fopen() on windows uses UTF-16, we use UTF-8 everywhere, this
function bridges the gap by using avpriv_open()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/vf_scale: add ov/hsub
Michael Niedermayer [Mon, 4 Nov 2013 13:18:09 +0000 (14:18 +0100)]
avfilter/vf_scale: add ov/hsub

Suggested-by: divVerent
Reviewed-by: Stefano
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agovf_fieldorder: remove superfluous get_video_buffer
Vittorio Giovara [Mon, 4 Nov 2013 13:37:06 +0000 (14:37 +0100)]
vf_fieldorder: remove superfluous get_video_buffer

5 years agodoc/examples: rename demuxing to demuxing_decoding.
Clément Bœsch [Mon, 4 Nov 2013 11:35:17 +0000 (12:35 +0100)]
doc/examples: rename demuxing to demuxing_decoding.

That example shows how the decoding process works, not only the
demuxing.

5 years agodoc/examples/demuxing: show how to use the reference counting system.
Clément Bœsch [Wed, 30 Oct 2013 14:50:36 +0000 (15:50 +0100)]
doc/examples/demuxing: show how to use the reference counting system.

5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 4 Nov 2013 10:50:47 +0000 (11:50 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  aacdec: Set the profile during decoding

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'da6506c607eda585ba4b15430cf3c9a2ce09c3a9'
Michael Niedermayer [Mon, 4 Nov 2013 10:41:55 +0000 (11:41 +0100)]
Merge commit 'da6506c607eda585ba4b15430cf3c9a2ce09c3a9'

* commit 'da6506c607eda585ba4b15430cf3c9a2ce09c3a9':
  lavc: move AVCodecContext.pkt to AVCodecInternal

Conflicts:
libavcodec/internal.h
libavcodec/rawdec.c
libavcodec/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '38ecc3702dabbea09230f6d6333f59e74f5d1c12'
Michael Niedermayer [Mon, 4 Nov 2013 10:14:38 +0000 (11:14 +0100)]
Merge commit '38ecc3702dabbea09230f6d6333f59e74f5d1c12'

* commit '38ecc3702dabbea09230f6d6333f59e74f5d1c12':
  pthread: store thread contexts in AVCodecInternal instead of AVCodecContext

Conflicts:
libavcodec/internal.h
libavcodec/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'daa7a1d4431b6acf1f93c4a98b3de123abf4ca18'
Michael Niedermayer [Mon, 4 Nov 2013 10:05:52 +0000 (11:05 +0100)]
Merge commit 'daa7a1d4431b6acf1f93c4a98b3de123abf4ca18'

* commit 'daa7a1d4431b6acf1f93c4a98b3de123abf4ca18':
  pthread_slice: rename ThreadContext -> SliceThreadContext

Conflicts:
libavcodec/pthread_slice.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'cc14ee03a7b91c69343f8d60c9e089a1950eeadb'
Michael Niedermayer [Mon, 4 Nov 2013 09:44:34 +0000 (10:44 +0100)]
Merge commit 'cc14ee03a7b91c69343f8d60c9e089a1950eeadb'

* commit 'cc14ee03a7b91c69343f8d60c9e089a1950eeadb':
  lavc: split slice and frame threading functions into separate files

Conflicts:
libavcodec/Makefile
libavcodec/pthread.c

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