chromium/third_party/ffmpeg.git
3 days agoadd avcodec_get_name symbol 80/69780/1 master
Tommy C. Li [Tue, 15 Apr 2014 22:49:27 +0000 (15:49 -0700)]
add avcodec_get_name symbol

7 days agoRemove C99 conversion process! 14/69614/3
Dale Curtis [Tue, 8 Apr 2014 23:27:41 +0000 (16:27 -0700)]
Remove C99 conversion process!

It was a fun exercise while it lasted, but \o/ for deletion!

BUG=350526
TEST=compiles w/ 2013.

Change-Id: Ifa564b23c3b009bb1555c510f22b4418f27c8cc3

6 weeks agoForce ffmpegsumo.dll to be optimized for size. 38/69138/2
Sebastien Marchand [Thu, 6 Mar 2014 18:32:31 +0000 (13:32 -0500)]
Force ffmpegsumo.dll to be optimized for size.

Change-Id: Idb2db0ef67b7a41d739c1d7d40e1bf1d3ec535f8

6 weeks agoavformat/mov: fix keyframe flags for sample from chromium Issue 340865
Michael Niedermayer [Wed, 12 Feb 2014 05:32:51 +0000 (06:32 +0100)]
avformat/mov: fix keyframe flags for sample from chromium Issue 340865

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 weeks agoavformat/mp3dec: optimize mp3_seek() for dir < 0
Michael Niedermayer [Sat, 1 Mar 2014 23:18:25 +0000 (00:18 +0100)]
avformat/mp3dec: optimize mp3_seek() for dir < 0

this minimizes the amount of protocol seeks and reading needed in that case

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 weeks agoStart rewriting build_ffmpeg.sh in python 74/68774/6
Paweł Hajdan, Jr [Thu, 13 Feb 2014 00:11:59 +0000 (00:11 +0000)]
Start rewriting build_ffmpeg.sh in python

This doesn't work on Windows yet - it'll be the next step,
after which build_ffmpeg.sh will be removed.

Change-Id: I9e96c7ee5c3cdf7be755376250af41f4053b0982

2 months agoMerge "Add a ffmpeg build config which disables assembly optimizations."
Dale Curtis [Thu, 6 Feb 2014 00:35:27 +0000 (16:35 -0800)]
Merge "Add a ffmpeg build config which disables assembly optimizations."

2 months agoavcodec/h264: fix code that blindly dereferences NULL DPB
Michael Niedermayer [Tue, 10 Dec 2013 22:41:50 +0000 (23:41 +0100)]
avcodec/h264: fix code that blindly dereferences NULL DPB

Fixes mixed flushing and decoding NULL packets
Found-by: wm4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2 months agoAdd a ffmpeg build config which disables assembly optimizations. 66/68666/1
Sergey Matveev [Wed, 5 Feb 2014 20:52:25 +0000 (00:52 +0400)]
Add a ffmpeg build config which disables assembly optimizations.

Also, use it for MemorySanitizer builds.

BUG=340376, 178409
R=dalecurtis@chromium.org

2 months agoavcodec/h264_cabac: Fix use with the checked bitstream-reader
Michael Niedermayer [Thu, 23 Jan 2014 23:05:17 +0000 (00:05 +0100)]
avcodec/h264_cabac: Fix use with the checked bitstream-reader

Found-by: Dale Curtis <dalecurtis@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2 months agoRemove now-unnecessary msvs_cygwin_shell: 1 55/68455/1
Scott Graham [Sun, 19 Jan 2014 04:24:47 +0000 (20:24 -0800)]
Remove now-unnecessary msvs_cygwin_shell: 1

This was only necessary for VS builds, and can be removed now.

Tested by removing ffmpegsumo.def and
ninja -C out\Debug gen\third_party\ffmpeg\ffmpegsumo.def

3 months agoLinux: upstream Gentoo Linux patches: 57/68357/1
Paweł Hajdan, Jr [Fri, 10 Jan 2014 15:21:31 +0000 (15:21 +0000)]
Linux: upstream Gentoo Linux patches:

- fix native build on arm (https://bugs.gentoo.org/show_bug.cgi?id=491466)
- enable gold linker (https://bugs.gentoo.org/show_bug.cgi?id=491850)
- fix gyp when there are no asm sources

BUG=none

3 months agoRemove trailing periods from rule messages.
Nico Weber [Thu, 9 Jan 2014 19:08:33 +0000 (11:08 -0800)]
Remove trailing periods from rule messages.

See commit message of r232166 for details.

BUG=none

Signed-off-by: Dale Curtis <dalecurtis@chromium.org>
3 months agoh264: Clear ERContext.cur_pic when unref'ing current picture.
Dale Curtis [Thu, 2 Jan 2014 22:29:38 +0000 (14:29 -0800)]
h264: Clear ERContext.cur_pic when unref'ing current picture.

Signed-off-by: Dale Curtis <dalecurtis@chromium.org>
4 months agoUpdate config files for MIPS Linux 46/68146/1
Petar Jovanovic [Tue, 17 Dec 2013 14:30:46 +0000 (15:30 +0100)]
Update config files for MIPS Linux

Recent update to FFmpeg config broke the build of Chromium for MIPS.
This change is result of two commands:
$ ./chromium/scripts/build_ffmpeg.sh linux mipsel <abs-path-to-ffmpeg>
$ ./chromium/scripts/copy_config.sh

BUG= regression build issue
TEST= build Chromium for MIPS

4 months agoavformat/oggdec: reset end_trimming when it has been used, so it cannot be used twice...
Michael Niedermayer [Thu, 12 Dec 2013 04:33:21 +0000 (05:33 +0100)]
avformat/oggdec: reset end_trimming when it has been used, so it cannot be used twice by mistake

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 months agoavformat/oggparseopus: Check opus_duration() return value
James Almer [Thu, 12 Dec 2013 06:34:19 +0000 (03:34 -0300)]
avformat/oggparseopus: Check opus_duration() return value

Regression since 39d11d599cd292485fe991cd22e10d7a1738b3bc

os->pduration would be wrongly assigned a negative value on invalid packets
instead of aborting.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 months agoPrevent end_trimming from carrying over after seek.
Dale Curtis [Wed, 11 Dec 2013 23:28:01 +0000 (15:28 -0800)]
Prevent end_trimming from carrying over after seek.

4 months agoFix leaked AVFrame after failed initialize.
Dale Curtis [Wed, 11 Dec 2013 22:37:21 +0000 (14:37 -0800)]
Fix leaked AVFrame after failed initialize.

4 months agoavformat/oggparseopus: calculate pts/dts for initial packets after seeking merge-m33
Michael Niedermayer [Wed, 11 Dec 2013 03:38:40 +0000 (04:38 +0100)]
avformat/oggparseopus: calculate pts/dts for initial packets after seeking

based on code from oggparsevorbis
Fixes Ticket3124
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 months agoavformat/oggparseopus: factor opus_duration() out
Michael Niedermayer [Wed, 11 Dec 2013 03:15:38 +0000 (04:15 +0100)]
avformat/oggparseopus: factor opus_duration() out

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 months agoFix deprecated functions and linker issues.
Dale Curtis [Tue, 10 Dec 2013 02:55:09 +0000 (18:55 -0800)]
Fix deprecated functions and linker issues.

4 months agoChange use of the obsolete armv7 gyp setting to arm_version==7.
Mostyn Bramley-Moore [Tue, 10 Dec 2013 01:22:27 +0000 (17:22 -0800)]
Change use of the obsolete armv7 gyp setting to arm_version==7.

BUG=234135

Signed-off-by: Dale Curtis <dalecurtis@chromium.org>
4 months agoUpdate config files for all platforms.
Dale Curtis [Tue, 10 Dec 2013 00:07:13 +0000 (16:07 -0800)]
Update config files for all platforms.

4 months agoMerge FFMpeg for M33.
Dale Curtis [Mon, 9 Dec 2013 20:49:59 +0000 (12:49 -0800)]
Merge FFMpeg for M33.

Merged from 9186343787c9fe2af1a3b0350ac556508dfbaaf6.

Conflicts:
configure
libavcodec/mpeg4video_parser.c

4 months agoMerge commit '7e244c68600f479270e979258e389ed5240885fb'
Michael Niedermayer [Mon, 9 Dec 2013 20:33:51 +0000 (21:33 +0100)]
Merge commit '7e244c68600f479270e979258e389ed5240885fb'

* commit '7e244c68600f479270e979258e389ed5240885fb':
  avframe: add codec-independent stereoscopic metadata

Conflicts:
Changelog
libavutil/Makefile
libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 months agocmdutils & opencl: add -opencl_bench option to test and show available OpenCL devices
Lenny Wang [Mon, 9 Dec 2013 03:01:00 +0000 (21:01 -0600)]
cmdutils & opencl: add -opencl_bench option to test and show available OpenCL devices

Reviewed-by: Wei Gao <highgod0401@gmail.com>
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 months agoMerge commit 'd64341e498fa46c6cf4c23d408177d7489559654'
Michael Niedermayer [Mon, 9 Dec 2013 19:52:14 +0000 (20:52 +0100)]
Merge commit 'd64341e498fa46c6cf4c23d408177d7489559654'

* commit 'd64341e498fa46c6cf4c23d408177d7489559654':
  configure: Prefix libc-related variables with "libc_"

Conflicts:
libavdevice/Makefile
libavformat/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 months agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Mon, 9 Dec 2013 19:45:42 +0000 (20:45 +0100)]
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Fix remuxing of IMA_QT in mov.
  Do not detect "00000000..." (and other non-changing values) as adp.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 months agoMerge commit '61b203ffe6c71789acb14f51483d63fe9e516842'
Michael Niedermayer [Mon, 9 Dec 2013 19:38:17 +0000 (20:38 +0100)]
Merge commit '61b203ffe6c71789acb14f51483d63fe9e516842'

* commit '61b203ffe6c71789acb14f51483d63fe9e516842':
  configure: detect Solaris libc

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 months agoMerge commit '9b8d11a76ae7bca8bbb58abb822138f8b42c776c'
Michael Niedermayer [Mon, 9 Dec 2013 19:31:29 +0000 (20:31 +0100)]
Merge commit '9b8d11a76ae7bca8bbb58abb822138f8b42c776c'

* commit '9b8d11a76ae7bca8bbb58abb822138f8b42c776c':
  avcodec: Use av_reallocp where suitable

Conflicts:
libavcodec/bitstream.c
libavcodec/eatgv.c
libavcodec/flashsv.c
libavcodec/libtheoraenc.c
libavcodec/libvpxenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 months agoMerge commit 'd4f1188d1a662fed5347e70016da49e01563e8a8'
Michael Niedermayer [Mon, 9 Dec 2013 19:06:39 +0000 (20:06 +0100)]
Merge commit 'd4f1188d1a662fed5347e70016da49e01563e8a8'

* commit 'd4f1188d1a662fed5347e70016da49e01563e8a8':
  dv: use AVFrame API properly

Conflicts:
libavcodec/dvdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 months agoMerge commit 'c9ca220ef26e36abd22085e6fa156c0dbc43bbf0'
Michael Niedermayer [Mon, 9 Dec 2013 18:57:58 +0000 (19:57 +0100)]
Merge commit 'c9ca220ef26e36abd22085e6fa156c0dbc43bbf0'

* commit 'c9ca220ef26e36abd22085e6fa156c0dbc43bbf0':
  ac3dec: make drc_scale exponentially

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 months agoMerge commit '37a749012aaacc801fe860428417a6d7b81c103f'
Michael Niedermayer [Mon, 9 Dec 2013 17:58:41 +0000 (18:58 +0100)]
Merge commit '37a749012aaacc801fe860428417a6d7b81c103f'

* commit '37a749012aaacc801fe860428417a6d7b81c103f':
  lavc: rework handling of refcounted_frames=0

Conflicts:
libavcodec/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 months agoMerge commit 'df7aba52b51007db50410abe15fe28391abd8757'
Michael Niedermayer [Mon, 9 Dec 2013 17:06:52 +0000 (18:06 +0100)]
Merge commit 'df7aba52b51007db50410abe15fe28391abd8757'

* commit 'df7aba52b51007db50410abe15fe28391abd8757':
  frame: cosmetics, reindent

Conflicts:
libavutil/frame.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 months agoMerge commit 'c342132fa8a29692e28c98238e3a31da5c407e42'
Michael Niedermayer [Mon, 9 Dec 2013 16:59:33 +0000 (17:59 +0100)]
Merge commit 'c342132fa8a29692e28c98238e3a31da5c407e42'

* commit 'c342132fa8a29692e28c98238e3a31da5c407e42':
  frame: copy flags in av_frame_copy_props()

Conflicts:
libavutil/frame.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 months agoMerge commit 'a1ee1648690726b34e98eaf8db04fd7b3303cfc8'
Michael Niedermayer [Mon, 9 Dec 2013 16:48:24 +0000 (17:48 +0100)]
Merge commit 'a1ee1648690726b34e98eaf8db04fd7b3303cfc8'

* commit 'a1ee1648690726b34e98eaf8db04fd7b3303cfc8':
  lavc/decode_video(): always unref the frame if there is no output in decode_video

Conflicts:
libavcodec/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 months agoMerge commit '85f947aefb3dae81f65f518acdffa8e31c679654'
Michael Niedermayer [Mon, 9 Dec 2013 15:13:37 +0000 (16:13 +0100)]
Merge commit '85f947aefb3dae81f65f518acdffa8e31c679654'

* commit '85f947aefb3dae81f65f518acdffa8e31c679654':
  lavc: remove a pointless check in decode_audio4()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 months agoMerge commit 'd4f0f2d1e80b76260eb6b9cdde472ac069dfda56'
Michael Niedermayer [Mon, 9 Dec 2013 15:07:17 +0000 (16:07 +0100)]
Merge commit 'd4f0f2d1e80b76260eb6b9cdde472ac069dfda56'

* commit 'd4f0f2d1e80b76260eb6b9cdde472ac069dfda56':
  lavc: use buf[0] instead of data[0] as the indicator of an allocated frame

Conflicts:
libavcodec/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 months agoavframe: add codec-independent stereoscopic metadata
Vittorio Giovara [Thu, 28 Nov 2013 13:47:13 +0000 (14:47 +0100)]
avframe: add codec-independent stereoscopic metadata

4 months agoMerge commit 'e5419709f50593769037ab77d7102f82d9260784'
Michael Niedermayer [Mon, 9 Dec 2013 12:31:23 +0000 (13:31 +0100)]
Merge commit 'e5419709f50593769037ab77d7102f82d9260784'

* commit 'e5419709f50593769037ab77d7102f82d9260784':
  lavc: remove the extended_data workarounds.

Conflicts:
libavcodec/utils.c

One hunk is not merged as not all codecs are updated yet

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 months agoFix remuxing of IMA_QT in mov.
Carl Eugen Hoyos [Mon, 9 Dec 2013 13:24:46 +0000 (14:24 +0100)]
Fix remuxing of IMA_QT in mov.

Fixes ticket #1603.

4 months agoDo not detect "00000000..." (and other non-changing values) as adp.
Carl Eugen Hoyos [Mon, 9 Dec 2013 12:51:00 +0000 (13:51 +0100)]
Do not detect "00000000..." (and other non-changing values) as adp.

4 months agoMerge commit 'd351ef47d0e0ccb7de96b37f137c16b2885580ac'
Michael Niedermayer [Mon, 9 Dec 2013 12:19:50 +0000 (13:19 +0100)]
Merge commit 'd351ef47d0e0ccb7de96b37f137c16b2885580ac'

* commit 'd351ef47d0e0ccb7de96b37f137c16b2885580ac':
  pthread_frame: use the AVFrame API properly.

Conflicts:
libavcodec/pthread_frame.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 months agoRevert: flvenc: Don't pretend to support muxing "plain" VP6
Carl Eugen Hoyos [Thu, 31 Oct 2013 00:24:07 +0000 (01:24 +0100)]
Revert: flvenc: Don't pretend to support muxing "plain" VP6

Muxing VP6 is used by applications and works with Flashplayer.

Reported-by: David Bertrand
4 months agoMerge commit 'b605b123ef1d3bac0e7c221d8d7fa74cd8c7253c'
Michael Niedermayer [Mon, 9 Dec 2013 12:02:16 +0000 (13:02 +0100)]
Merge commit 'b605b123ef1d3bac0e7c221d8d7fa74cd8c7253c'

* commit 'b605b123ef1d3bac0e7c221d8d7fa74cd8c7253c':
  mxpegdec: use the AVFrame API properly.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 months agoMerge commit 'afa21a12bf084f905187615706b0a8d92bc98661'
Michael Niedermayer [Mon, 9 Dec 2013 11:54:59 +0000 (12:54 +0100)]
Merge commit 'afa21a12bf084f905187615706b0a8d92bc98661'

* commit 'afa21a12bf084f905187615706b0a8d92bc98661':
  p*menc: use the AVFrame API properly.

Conflicts:
libavcodec/Makefile
libavcodec/pamenc.c
libavcodec/pnmenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 months agoMerge commit 'e2274aa555f023e4f4e4819bf29b2d7e0adec7d5'
Michael Niedermayer [Mon, 9 Dec 2013 11:32:37 +0000 (12:32 +0100)]
Merge commit 'e2274aa555f023e4f4e4819bf29b2d7e0adec7d5'

* commit 'e2274aa555f023e4f4e4819bf29b2d7e0adec7d5':
  mjpegdec: use the AVFrame API properly.

Conflicts:
libavcodec/mjpegdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 months agoAdd support for picture_ptr field in MJpegDecodeContext
anatoly [Sun, 27 Mar 2011 20:16:25 +0000 (22:16 +0200)]
Add support for picture_ptr field in MJpegDecodeContext

Signed-off-by: Anton Khirnov <anton@khirnov.net>
(cherry picked from commit e0e3b8b297bae5144f23fd4b46a1309857040b63)

Conflicts:

libavcodec/jpeglsdec.c
libavcodec/mjpegbdec.c
libavcodec/mjpegdec.c

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 months agoMerge commit 'f0b234ab9e406efee85c17eb435db646092a943b'
Michael Niedermayer [Mon, 9 Dec 2013 10:44:37 +0000 (11:44 +0100)]
Merge commit 'f0b234ab9e406efee85c17eb435db646092a943b'

* commit 'f0b234ab9e406efee85c17eb435db646092a943b':
  avformat: AviSynth demuxer rewrite

Conflicts:
configure
libavformat/avisynth.c

See: b9ad009475f3afb76bd2fbd92936dc4d4cd441ec (as well as later commits)
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 months agoconfigure: Prefix libc-related variables with "libc_"
Diego Biurrun [Wed, 4 Dec 2013 17:21:30 +0000 (12:21 -0500)]
configure: Prefix libc-related variables with "libc_"

Simplifies host/target libc detection splitting.

4 months agoconfigure: detect Solaris libc
Sean McGovern [Sun, 8 Dec 2013 22:17:12 +0000 (17:17 -0500)]
configure: detect Solaris libc

Add preprocessor flags for API availability as necessary.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
4 months agoavcodec: Use av_reallocp where suitable
Alexandra Khirnova [Fri, 6 Dec 2013 12:44:17 +0000 (13:44 +0100)]
avcodec: Use av_reallocp where suitable

Signed-off-by: Martin Storsjö <martin@martin.st>
4 months agodv: use AVFrame API properly
Anton Khirnov [Fri, 29 Nov 2013 07:58:10 +0000 (08:58 +0100)]
dv: use AVFrame API properly

4 months agoac3dec: make drc_scale exponentially
John Stebbins [Wed, 20 Nov 2013 17:26:45 +0000 (09:26 -0800)]
ac3dec: make drc_scale exponentially

The a52 spec suggests that "partial compression" should scale the
drc value in this manner.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
4 months agolavc: rework handling of refcounted_frames=0
Anton Khirnov [Fri, 29 Nov 2013 19:49:18 +0000 (20:49 +0100)]
lavc: rework handling of refcounted_frames=0

Use only proper AVFrame API (no assigning of whole frames, since that
hardcodes sizeof(AVFrame) into lavc).

Make a copy of the side data, so the caller can use av_frame_unref/free
on non-refcounted frames, eliminating the need for
avcodec_get_frame_defaults()/avcodec_free_frame().

4 months agoframe: cosmetics, reindent
Anton Khirnov [Fri, 29 Nov 2013 19:41:35 +0000 (20:41 +0100)]
frame: cosmetics, reindent

4 months agoframe: copy flags in av_frame_copy_props()
Anton Khirnov [Fri, 29 Nov 2013 19:40:34 +0000 (20:40 +0100)]
frame: copy flags in av_frame_copy_props()

Flags can be considered metadata (at least those that are defined now).

4 months agolavc/decode_video(): always unref the frame if there is no output in decode_video
Anton Khirnov [Fri, 29 Nov 2013 19:20:20 +0000 (20:20 +0100)]
lavc/decode_video(): always unref the frame if there is no output in decode_video

Not just on failure. This is the same thing that is done in the audio
path and should prevent leaks in decoders that allocate a frame, but
then end up not writing into it.

4 months agolavc: remove a pointless check in decode_audio4()
Anton Khirnov [Fri, 29 Nov 2013 19:19:27 +0000 (20:19 +0100)]
lavc: remove a pointless check in decode_audio4()

av_frame_unref() works fine on unallocated frames.

4 months agolavc: use buf[0] instead of data[0] as the indicator of an allocated frame
Anton Khirnov [Fri, 29 Nov 2013 19:16:07 +0000 (20:16 +0100)]
lavc: use buf[0] instead of data[0] as the indicator of an allocated frame

data[0] may be NULL for valid frames with hwaccel pixel formats.

4 months agolavc: remove the extended_data workarounds.
Anton Khirnov [Sat, 9 Nov 2013 18:57:14 +0000 (19:57 +0100)]
lavc: remove the extended_data workarounds.

All decoders should now handle it properly.

4 months agopthread_frame: use the AVFrame API properly.
Anton Khirnov [Sat, 9 Nov 2013 09:14:46 +0000 (10:14 +0100)]
pthread_frame: use the AVFrame API properly.

Remove the extended_data workaround, all decoders should now handle this
properly.

4 months agomxpegdec: use the AVFrame API properly.
Anton Khirnov [Sat, 9 Nov 2013 09:14:46 +0000 (10:14 +0100)]
mxpegdec: use the AVFrame API properly.

4 months agop*menc: use the AVFrame API properly.
Anton Khirnov [Sat, 9 Nov 2013 09:14:46 +0000 (10:14 +0100)]
p*menc: use the AVFrame API properly.

4 months agomjpegdec: use the AVFrame API properly.
Anton Khirnov [Sat, 9 Nov 2013 09:14:46 +0000 (10:14 +0100)]
mjpegdec: use the AVFrame API properly.

4 months agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 9 Dec 2013 03:46:24 +0000 (04:46 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  configure: Move adding of compat objects out of libc detection

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 months agoMerge commit '4958f35a2ebc307049ff2104ffb944f5f457feb3'
Michael Niedermayer [Mon, 9 Dec 2013 03:12:40 +0000 (04:12 +0100)]
Merge commit '4958f35a2ebc307049ff2104ffb944f5f457feb3'

* commit '4958f35a2ebc307049ff2104ffb944f5f457feb3':
  dsputil: Move apply_window_int16 to ac3dsp

Conflicts:
libavcodec/arm/ac3dsp_init_arm.c
libavcodec/arm/ac3dsp_neon.S
libavcodec/x86/ac3dsp_init.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 months agocommon.mak: Less ugly version of the previous windres fix
James Almer [Mon, 9 Dec 2013 01:44:52 +0000 (22:44 -0300)]
common.mak: Less ugly version of the previous windres fix

Using subst here is a really ugly hack

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 months agoconfigure: Move MinGW64 specific check to the correct place
James Almer [Sun, 8 Dec 2013 19:13:07 +0000 (16:13 -0300)]
configure: Move MinGW64 specific check to the correct place

It was misplaced during merge of commit 120797e2ef0ca317daf63ad79be5f72f835e9ac2

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 months agocommon.mak: fix the current fate failures with windres
James Almer [Sun, 8 Dec 2013 18:57:36 +0000 (15:57 -0300)]
common.mak: fix the current fate failures with windres

Tested-by: Hendrik Leppkes <h.leppkes@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 months agoavcodec/ffv1enc: support forcing experimental 1.4 version
Michael Niedermayer [Sun, 8 Dec 2013 23:39:02 +0000 (00:39 +0100)]
avcodec/ffv1enc: support forcing experimental 1.4 version

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 months agoavcodec/ffv1: support adjusting the g vs r + b coefficient in the RCT
Michael Niedermayer [Sun, 8 Dec 2013 21:09:50 +0000 (22:09 +0100)]
avcodec/ffv1: support adjusting the g vs r + b coefficient in the RCT

about 1% better compression

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 months agoavformat: AviSynth demuxer rewrite
d s [Wed, 27 Nov 2013 02:58:28 +0000 (21:58 -0500)]
avformat: AviSynth demuxer rewrite

Directly loads AviSynth through LoadLibrary instead of relying on
Video for Windows, and supports using AvxSynth (via dlopen) to
open scripts on Linux and OS X.

Error messages from AviSynth/AvxSynth are now reported through
av_log and exit, rather than the traditional behavior of generating
an error video that the user would need to watch to diagnose.

The main rewrite was authored by d s <avxsynth.testing@gmail.com>
from the AvxSynth team, with additional contributions by

Oka Motofumi <chikuzen.mo@gmail.com>
Stephen Hutchinson <qyot27@gmail.com>
Diego Biurrun <diego@biurrun.de>
Anton Khirnov <anton@khirnov.net>

Signed-off-by: Anton Khirnov <anton@khirnov.net>
4 months agoconfigure: Move adding of compat objects out of libc detection
Diego Biurrun [Mon, 2 Dec 2013 04:06:02 +0000 (23:06 -0500)]
configure: Move adding of compat objects out of libc detection

4 months agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 8 Dec 2013 18:00:28 +0000 (19:00 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  configure: Separate MinGW32 and MinGW64 libc handling

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 months agoavformat/rtpdec: Enable GSM RTP depacketization
Andrey Utkin [Thu, 5 Dec 2013 20:35:03 +0000 (22:35 +0200)]
avformat/rtpdec: Enable GSM RTP depacketization

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 months agoconfigure: Special case libfreetype test
Alexander Strasser [Fri, 6 Dec 2013 16:20:26 +0000 (17:20 +0100)]
configure: Special case libfreetype test

Include the freetype header, in-directly through a macro, like it
is done in the drawtext filter. Do not break if the header is moved.

Unfortunately the drawtext filter included the file where the include
macros are defined in a wrong way. This is not needed and breaks the
build. Remove that #include line too.

Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
4 months agodsputil: Move apply_window_int16 to ac3dsp
Diego Biurrun [Fri, 6 Dec 2013 12:22:40 +0000 (12:22 +0000)]
dsputil: Move apply_window_int16 to ac3dsp

The (optimized) functions are used nowhere else.

4 months agoavfilter/vf_mergeplanes: specify pixel format min/max
Michael Niedermayer [Sat, 7 Dec 2013 14:41:40 +0000 (15:41 +0100)]
avfilter/vf_mergeplanes: specify pixel format min/max

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 months agoavcodec/mpeg4video: fix 2 more incorrectly associated comments
Michael Niedermayer [Sun, 8 Dec 2013 15:05:47 +0000 (16:05 +0100)]
avcodec/mpeg4video: fix 2 more incorrectly associated comments

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 months agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 8 Dec 2013 12:49:16 +0000 (13:49 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  libvpx: do not mark VP9 as experimental when using libvpx >= 1.3.0

Conflicts:
libavcodec/libvpxdec.c
libavcodec/libvpxenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 months agoconfigure: Separate MinGW32 and MinGW64 libc handling
Diego Biurrun [Mon, 2 Dec 2013 05:12:57 +0000 (00:12 -0500)]
configure: Separate MinGW32 and MinGW64 libc handling

4 months agolibvpxenc: token_parts is VP8 specific
James Almer [Sat, 7 Dec 2013 19:33:58 +0000 (16:33 -0300)]
libvpxenc: token_parts is VP8 specific

Signed-off-by: James Almer <jamrial@gmail.com>
Reviewed-by: James Zern <jzern@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 months agolibvpx: do not mark VP9 as experimental when using libvpx >= 1.3.0
Guillaume Martres [Fri, 15 Nov 2013 22:28:30 +0000 (23:28 +0100)]
libvpx: do not mark VP9 as experimental when using libvpx >= 1.3.0

Signed-off-by: Diego Biurrun <diego@biurrun.de>
4 months agowindres: Track dependencies
James Almer [Sat, 7 Dec 2013 02:45:05 +0000 (23:45 -0300)]
windres: Track dependencies

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 months agoMerge remote-tracking branch 'rbultje/vp9-simd'
Michael Niedermayer [Sat, 7 Dec 2013 18:00:03 +0000 (19:00 +0100)]
Merge remote-tracking branch 'rbultje/vp9-simd'

* rbultje/vp9-simd:
  vp9: implement top/left half (4x4) sub-8x8-IDCT.
  vp9: split pre-load of 11585x2 out of 1d idct macro.
  vp9: minor refactorings in idct ssse3 assembly.
  vp9: split x86 assembly in two files.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 months agovp9: implement top/left half (4x4) sub-8x8-IDCT.
Ronald S. Bultje [Mon, 2 Dec 2013 02:27:34 +0000 (21:27 -0500)]
vp9: implement top/left half (4x4) sub-8x8-IDCT.

For that specific case (eob>3&&eob<=12), runtime of idct8x8 goes from
668 to 477 cycles. For all idct8x8, runtime goes from 521 to 490 cycles.

4 months agovp9: split pre-load of 11585x2 out of 1d idct macro.
Ronald S. Bultje [Mon, 2 Dec 2013 13:03:04 +0000 (08:03 -0500)]
vp9: split pre-load of 11585x2 out of 1d idct macro.

This allows us to load it only once, instead of twice, in this function.

4 months agovp9: minor refactorings in idct ssse3 assembly.
Ronald S. Bultje [Mon, 2 Dec 2013 13:02:43 +0000 (08:02 -0500)]
vp9: minor refactorings in idct ssse3 assembly.

Make register usage in macros explicit; change mulsub_2w_4x to use 2
instead of 3 temp registers.

4 months agovp9: split x86 assembly in two files.
Ronald S. Bultje [Sun, 1 Dec 2013 21:27:16 +0000 (16:27 -0500)]
vp9: split x86 assembly in two files.

(And in future, loopfilter or intra pred could be put in their own
respective files also.)

4 months agoMerge remote-tracking branch 'cus/stable'
Michael Niedermayer [Sat, 7 Dec 2013 15:11:22 +0000 (16:11 +0100)]
Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffplay: set default window size before starting audio
  ffplay: factor out function setting default window size
  ffplay: remove no longer necessary codec flush
  ffplay: do not wait for flushing the picture queue on flush packet

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 months agoavutil/opt: Implement av_opt_set_defaults* in O(N) instead of O(N²) time
Michael Niedermayer [Sat, 7 Dec 2013 11:41:09 +0000 (12:41 +0100)]
avutil/opt: Implement av_opt_set_defaults* in O(N) instead of O(N²) time

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 months agoavutil/opt: factor set_string_color() out
Michael Niedermayer [Sat, 7 Dec 2013 12:09:33 +0000 (13:09 +0100)]
avutil/opt: factor set_string_color() out

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 months agoavutil/opt: factor set_string_video_rate() out
Michael Niedermayer [Sat, 7 Dec 2013 12:04:38 +0000 (13:04 +0100)]
avutil/opt: factor set_string_video_rate() out

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 months agoavutil/opt: factor set_string_image_size() out
Michael Niedermayer [Sat, 7 Dec 2013 12:01:38 +0000 (13:01 +0100)]
avutil/opt: factor set_string_image_size() out

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 months agoavformat/utils: remove unused variable
Michael Niedermayer [Sat, 7 Dec 2013 10:59:53 +0000 (11:59 +0100)]
avformat/utils: remove unused variable

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 months agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 7 Dec 2013 10:48:25 +0000 (11:48 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  dcadec: Decode LFE to avoid adding random data when downmixing with LFE

See: 6e7de1144436a6871fdbd7859f3a2ece6e89d9fb
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 months agoavformat/utils: reject poorly fitting rfps values earlier
Michael Niedermayer [Sat, 7 Dec 2013 03:13:44 +0000 (04:13 +0100)]
avformat/utils: reject poorly fitting rfps values earlier

This avoids collecting statistics for rfps values that very likely
will get rejected later.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 months agoavformat/mov: use rfps_add_frame() only for video
Michael Niedermayer [Sat, 7 Dec 2013 02:23:49 +0000 (03:23 +0100)]
avformat/mov: use rfps_add_frame() only for video

it makes no sense for other streams

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