chromium/third_party/ffmpeg.git
10 days agoavcodec: fix aac/ac3 parser bitstream buffer size master
Michael Niedermayer [Thu, 21 Aug 2014 23:15:57 +0000 (01:15 +0200)]
avcodec: fix aac/ac3 parser bitstream buffer size

Buffers containing copies of the AAC and AC3 header bits were not padded
before parsing, violating init_get_bits() buffer padding requirement,
leading to potential buffer read overflows.
This change adds FF_INPUT_BUFFER_PADDING_SIZE bytes to the bit buffer
for parsing the header in each of aac_parser.c and ac3_parser.c.

Based on patch by: Matt Wolenetz <wolenetz@chromium.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 days agoMention ssh keys in README.chromium 68/71268/2
Nico Weber [Tue, 19 Aug 2014 20:04:03 +0000 (13:04 -0700)]
Mention ssh keys in README.chromium

Change-Id: I063ff8f0956cb2d7a96d36778ad481a3e162f28d

13 days agoMerge "ffmpeg: Suppress a few warnings that are visible on the clang/win bot."
Nico Weber [Tue, 19 Aug 2014 20:05:15 +0000 (13:05 -0700)]
Merge "ffmpeg: Suppress a few warnings that are visible on the clang/win bot."

13 days agoffmpeg: Suppress a few warnings that are visible on the clang/win bot. 67/71267/1
Nico Weber [Tue, 19 Aug 2014 18:26:18 +0000 (11:26 -0700)]
ffmpeg: Suppress a few warnings that are visible on the clang/win bot.

BUG=chromium:82385

3 weeks agoMerge "Update config files for MIPS Linux"
Matthew Wolenetz [Mon, 11 Aug 2014 23:12:00 +0000 (16:12 -0700)]
Merge "Update config files for MIPS Linux"

3 weeks agoUpdate OWNERS to fix ddorwin@, remove shadi@, and add wolenetz@ 67/71167/2
Matt Wolenetz [Mon, 11 Aug 2014 22:28:50 +0000 (15:28 -0700)]
Update OWNERS to fix ddorwin@, remove shadi@, and add wolenetz@

Change-Id: I53583c17bf26a125e67765651844181a61832b6b

3 weeks agoUpdate config files for MIPS Linux 47/71147/1
Petar Jovanovic [Mon, 11 Aug 2014 10:43:23 +0000 (12:43 +0200)]
Update config files for MIPS Linux

Recent update to FFmpeg config broke the build of Chromium for MIPS.
This change is a result of two commands:

$ ./chromium/scripts/build_ffmpeg.py linux mipsel
$ ./chromium/scripts/copy_config.sh

BUG= regression build issue
TEST= build Chromium for MIPS Linux

3 weeks agoUpdate README.chromium's license file reference 41/71141/1
Matt Wolenetz [Fri, 8 Aug 2014 22:38:55 +0000 (15:38 -0700)]
Update README.chromium's license file reference

As of upstream 50f4d0bb50522240b048231c29c6e852e82ade01, the license
file was changed from LICENSE to LICENSE.md and became
markdown-formatted.

This change updates README.chromium to comply in Chromium with both:
* src/tools/licenses.py scan
* src/android_webview/tools/webview_licenses.py scan

3 weeks agoMerge FFmpeg for M38
Matt Wolenetz [Fri, 8 Aug 2014 18:48:40 +0000 (11:48 -0700)]
Merge FFmpeg for M38

Updates FFmpeg to afd62b3f184569492230e7f34ad55581c6b2d2c3

3 weeks agoAdd avcodec_free_context to ffmpegsumo.sigs merge-m38
Matt Wolenetz [Fri, 8 Aug 2014 01:19:46 +0000 (18:19 -0700)]
Add avcodec_free_context to ffmpegsumo.sigs

3 weeks agoRevert "Ignore xing number of frames if the file is larger than indicated."
Matt Wolenetz [Thu, 7 Aug 2014 20:22:57 +0000 (13:22 -0700)]
Revert "Ignore xing number of frames if the file is larger than indicated."

This reverts commit ef21b3d38e61ba6730eb1d4573da65ca222b3619.

It seems this commit is too sensitive to differing filesize in xing
header vs file size: with differences large enough, mp3->frames is reset
and inaccurate duration estimation logic is engaged and regresses
Chromium downstream:

AudioFileReaderTest.MP3 (sfx.mp3):
 fsize=2189, mp3->header_filesize=2029, min=2029, delta=160
 resetting frames from 12 to 0
 Value of: reader_->GetDuration().InMicroseconds()
  Actual: 423651, Expected: 313470
 Value of: reader_->GetNumberOfFrames()
  Actual: 18684, Expected: 13825

For embedded art, it is even worse due to even larger difference in file
size vs header's file size:
AudioVideoMetadataExtractorTest.AudioMP3 (id3_png_test.mp3):
 fsize=180999, mp3->header_filesize=25076, min=25076, delta=155923
 resetting mp3->frames from 39 to 0
 Value of: extractor->duration()
  Actual: 7, Expected: 1

3 weeks agoDisable deprecation warnings for usage of AVStream.pts in lavf/mux.c
Matt Wolenetz [Wed, 6 Aug 2014 21:34:01 +0000 (14:34 -0700)]
Disable deprecation warnings for usage of AVStream.pts in lavf/mux.c

This change reduces the amount of compiler warnings when using the
deprecated AVStream.pts field in lavf/mux.c.

3 weeks agoForward-declare struct AVBPrint in lavf/avio.h
Matt Wolenetz [Wed, 6 Aug 2014 20:22:54 +0000 (13:22 -0700)]
Forward-declare struct AVBPrint in lavf/avio.h

With -Werror,-Wvisibility, and recent lack of bprint.h inclusion in
avio.h, this change prevents compile error in downstream Chromium by
forward-declaring struct AVBPrint in lavf/avio.h.

3 weeks agoCondition usage of destruct API in lavf/mux ff_write_chained
Matt Wolenetz [Wed, 6 Aug 2014 20:00:15 +0000 (13:00 -0700)]
Condition usage of destruct API in lavf/mux ff_write_chained

This change makes the update of AVPacket's destruct field in lavf/mux's
ff_write_chained() limited to when FF_API_DESTRUCT_PACKET is true.

3 weeks agoUpdate documentation and config/gypi/gni scripts
Matt Wolenetz [Mon, 4 Aug 2014 19:45:12 +0000 (12:45 -0700)]
Update documentation and config/gypi/gni scripts

Fixes some script and documentation issues encountered while updating
configs and gypi/gni:
* Removes obsolete 'win-vs2013' build_ffmpeg.py option (just use 'win')
* Updates linux-noasm build_ffmpeg.py usage to be valid for just 'x64'
  (other architecture options are not used, though script may allow)
* Fixes broken ffmpeg_generated.gni file writing in generate_gyp.py
* Updates README's Short Directions with current build_ffmpeg.py usage

3 weeks agoSync recent gyp changes to the gn file. 84/71084/1
Nico Weber [Tue, 5 Aug 2014 21:48:31 +0000 (14:48 -0700)]
Sync recent gyp changes to the gn file.

Change-Id: Iee307d74999f55198c9431ebd2b2cd268e4df30c

3 weeks agoUpdate clang warnings after r287092. 82/71082/2
Nico Weber [Tue, 5 Aug 2014 19:04:35 +0000 (12:04 -0700)]
Update clang warnings after r287092.

Chromium r287092 added a clang_warning_flags mechanism to share
clang flags between Linux, Mac, and other platforms. Use that in ffmpeg.gyp

Also remove -Wno-attributes since clang implements __attribute__((flatten))
these days, adn remove -Qunused-arguments as clang now seems to
understand all the -f flags that ffmpeg.gyp passes.

BUG=none

Change-Id: Ib0c46bc74997f1adb1dc19cd941af2e418a0977c

4 weeks agoRoll FFmpeg for M38.
Matt Wolenetz [Fri, 1 Aug 2014 22:24:48 +0000 (15:24 -0700)]
Roll FFmpeg for M38.

Merge point afd62b3f184569492230e7f34ad55581c6b2d2c3

Conflicts:
libavcodec/utils.c
libavformat/matroskadec.c

4 weeks agoMerge commit 'fa14804c83a7108a50c63d1f2180e30c75909529'
Michael Niedermayer [Fri, 1 Aug 2014 19:34:31 +0000 (21:34 +0200)]
Merge commit 'fa14804c83a7108a50c63d1f2180e30c75909529'

* commit 'fa14804c83a7108a50c63d1f2180e30c75909529':
  flv: Index the audio stream

Conflicts:
libavformat/flvdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 weeks agoavcodec/mpeg12dec: fix support for interlaced mpeg2 with missing last slice
Michael Niedermayer [Fri, 1 Aug 2014 19:10:43 +0000 (21:10 +0200)]
avcodec/mpeg12dec: fix support for interlaced mpeg2 with missing last slice

Fixes Ticket3809

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 weeks agoavcodec/mpeg12dec: print the amount of overread
Michael Niedermayer [Fri, 1 Aug 2014 19:06:13 +0000 (21:06 +0200)]
avcodec/mpeg12dec: print the amount of overread

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 weeks agoh264_mp4toannexb_bsf: rename first_idr to new_idr
Benoit Fouet [Fri, 1 Aug 2014 13:31:30 +0000 (15:31 +0200)]
h264_mp4toannexb_bsf: rename first_idr to new_idr

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 weeks agoMerge commit '7ab551f9fd9a63586649a7df8790ddaeac55420f'
Michael Niedermayer [Fri, 1 Aug 2014 15:34:57 +0000 (17:34 +0200)]
Merge commit '7ab551f9fd9a63586649a7df8790ddaeac55420f'

* commit '7ab551f9fd9a63586649a7df8790ddaeac55420f':
  h264: prevent theoretical infinite loop in SEI parsing

Conflicts:
libavcodec/h264_sei.c

Not merged, as this would remove 2 bitstream compliance checks.
The specification does not allow the bitstream to end in the middle
of these variable length elements and we have no samples which
have such non compliant truncation either so its better to error
out. Which is simpler as well

This issue also has been fixed long ago
See: 9decfc17bb76da34734296048d390b176abf404c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 weeks agoMerge commit 'b2e059a1ffbdaaa985c6a7dcdd684fa034725238'
Michael Niedermayer [Fri, 1 Aug 2014 14:56:42 +0000 (16:56 +0200)]
Merge commit 'b2e059a1ffbdaaa985c6a7dcdd684fa034725238'

* commit 'b2e059a1ffbdaaa985c6a7dcdd684fa034725238':
  pixdesc: K&R formatting cosmetics

Conflicts:
libavutil/pixdesc.c
libavutil/pixdesc.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 weeks agoMerge commit '92a36a6b3338df5f5cff573a486e182005367c24'
Michael Niedermayer [Fri, 1 Aug 2014 14:48:09 +0000 (16:48 +0200)]
Merge commit '92a36a6b3338df5f5cff573a486e182005367c24'

* commit '92a36a6b3338df5f5cff573a486e182005367c24':
  pngdec: correctly indent macros

Conflicts:
libavcodec/pngdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 weeks agoMerge commit '52269f48e835a52023656f8330262ae70e6061c4'
Michael Niedermayer [Fri, 1 Aug 2014 14:39:22 +0000 (16:39 +0200)]
Merge commit '52269f48e835a52023656f8330262ae70e6061c4'

* commit '52269f48e835a52023656f8330262ae70e6061c4':
  Revert "vf_interlace: deprecate lowpass option"

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 weeks agoMerge commit '4da8cdbb91ddbac118b79076cad4dc28ba72e86f'
Michael Niedermayer [Fri, 1 Aug 2014 14:34:20 +0000 (16:34 +0200)]
Merge commit '4da8cdbb91ddbac118b79076cad4dc28ba72e86f'

* commit '4da8cdbb91ddbac118b79076cad4dc28ba72e86f':
  tscc: Eliminate pointless variable indirections in decode_frame()

Conflicts:
libavcodec/tscc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 weeks agoMerge commit '5735552f1f17ea01dcbc99b08f54b5bf52176a8f'
Michael Niedermayer [Fri, 1 Aug 2014 14:24:04 +0000 (16:24 +0200)]
Merge commit '5735552f1f17ea01dcbc99b08f54b5bf52176a8f'

* commit '5735552f1f17ea01dcbc99b08f54b5bf52176a8f':
  pngenc: Drop pointless pointer cast in png_write_row()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 weeks agoMerge commit 'a786c8259dafeca9744252230b5d78f67810770c'
Michael Niedermayer [Fri, 1 Aug 2014 13:38:24 +0000 (15:38 +0200)]
Merge commit 'a786c8259dafeca9744252230b5d78f67810770c'

* commit 'a786c8259dafeca9744252230b5d78f67810770c':
  idct: Split off Xvid IDCT

Conflicts:
libavcodec/Makefile
libavcodec/mpeg4videodec.c
libavcodec/x86/Makefile
libavcodec/x86/idctdsp_init.c

This split is somewhat restructured leaving the xvid IDCT available
outside mpeg4 if manually selected.

The code also could not be merged unchanged as it conflicted with a
bugfix in FFmpeg

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 weeks agoMerge commit '03c9f357a4c2307a7913cea2cbf0ba817e80beb6'
Michael Niedermayer [Fri, 1 Aug 2014 13:11:05 +0000 (15:11 +0200)]
Merge commit '03c9f357a4c2307a7913cea2cbf0ba817e80beb6'

* commit '03c9f357a4c2307a7913cea2cbf0ba817e80beb6':
  ppc: idctdsp: Immediately return if no AltiVec is available

Conflicts:
libavcodec/ppc/idctdsp.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 weeks agoflv: Index the audio stream
Luca Barbato [Fri, 1 Aug 2014 01:03:20 +0000 (03:03 +0200)]
flv: Index the audio stream

And leverage the video index if the video is just disabled as wm4
did in an initial patch.

4 weeks agoMerge commit '706208ef47bffd525c982975d2756f7b2b220b8d'
Michael Niedermayer [Fri, 1 Aug 2014 12:33:16 +0000 (14:33 +0200)]
Merge commit '706208ef47bffd525c982975d2756f7b2b220b8d'

* commit '706208ef47bffd525c982975d2756f7b2b220b8d':
  fate: Split fate-pixdesc tests and dispatch them through Make

Conflicts:
tests/fate-run.sh
tests/ref/fate/filter-pixdesc

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 weeks agoavfilter/vf_pullup: 2nd try to workaround gcc 4.4.3 bug on arm
Michael Niedermayer [Fri, 1 Aug 2014 12:06:42 +0000 (14:06 +0200)]
avfilter/vf_pullup: 2nd try to workaround gcc 4.4.3 bug on arm

The first try failed to work with some build flags

The gcc version affected is very old and unmaintained AFAIK thus i made no
attempt to report this to the gcc developers.

The workaround is pushed as it may still affect users and does affect one
fate client

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 weeks agoh264: prevent theoretical infinite loop in SEI parsing
Vittorio Giovara [Wed, 30 Jul 2014 18:33:36 +0000 (19:33 +0100)]
h264: prevent theoretical infinite loop in SEI parsing

Properly address CVE-2011-3946 and parse bitstream as described in the spec.

CC: libav-stable@libav.org
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
4 weeks agopixdesc: K&R formatting cosmetics
Luca Barbato [Mon, 28 Jul 2014 20:28:13 +0000 (22:28 +0200)]
pixdesc: K&R formatting cosmetics

Also change some comments to multiline.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
4 weeks agopngdec: correctly indent macros
Vittorio Giovara [Thu, 31 Jul 2014 13:25:30 +0000 (14:25 +0100)]
pngdec: correctly indent macros

4 weeks agoRevert "vf_interlace: deprecate lowpass option"
Vittorio Giovara [Wed, 30 Jul 2014 20:12:14 +0000 (21:12 +0100)]
Revert "vf_interlace: deprecate lowpass option"

This reverts commit 35b05c5184fb3aa1191e2d1e7f1cae1e11f344a4.
A warning is introduced in case this option is used.

4 weeks agotscc: Eliminate pointless variable indirections in decode_frame()
Diego Biurrun [Tue, 29 Jul 2014 16:57:48 +0000 (09:57 -0700)]
tscc: Eliminate pointless variable indirections in decode_frame()

4 weeks agopngenc: Drop pointless pointer cast in png_write_row()
Diego Biurrun [Tue, 29 Jul 2014 15:43:40 +0000 (08:43 -0700)]
pngenc: Drop pointless pointer cast in png_write_row()

4 weeks agoFix standalone compilation of the WebVTT decoder.
Carl Eugen Hoyos [Fri, 1 Aug 2014 10:50:38 +0000 (12:50 +0200)]
Fix standalone compilation of the WebVTT decoder.

4 weeks agoAdd forgotten APIchanges entry for probesize2.
Carl Eugen Hoyos [Fri, 1 Aug 2014 10:49:56 +0000 (12:49 +0200)]
Add forgotten APIchanges entry for probesize2.

Update some git hashes.

4 weeks agoh264_mp4toannexb_bsf: always set idr_sps_pps_seen when SPS/PPS is seen.
Benoit Fouet [Thu, 31 Jul 2014 13:40:51 +0000 (15:40 +0200)]
h264_mp4toannexb_bsf: always set idr_sps_pps_seen when SPS/PPS is seen.

In order not to break a sequence like "SPS IDR SPS IDR", the boolean
telling that the SPS/PPS has been seen should always be set.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 weeks agoh264: remove useless assignment.
Benoit Fouet [Thu, 31 Jul 2014 12:32:02 +0000 (14:32 +0200)]
h264: remove useless assignment.

source index, as well as dest one, is unconditionnaly set afterwards,
before being effectively used.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 weeks agoidct: Split off Xvid IDCT
Diego Biurrun [Mon, 21 Jul 2014 20:13:21 +0000 (13:13 -0700)]
idct: Split off Xvid IDCT

The Xvid IDCT is only required to decode some Xvid-encoded MPEG-4 files,
so there is no point in having it as an unconditional part of idctdsp.

4 weeks agoppc: idctdsp: Immediately return if no AltiVec is available
Diego Biurrun [Thu, 31 Jul 2014 11:48:07 +0000 (04:48 -0700)]
ppc: idctdsp: Immediately return if no AltiVec is available

This is how all the other init functions operate.

4 weeks agofate: Split fate-pixdesc tests and dispatch them through Make
Diego Biurrun [Tue, 29 Jul 2014 09:41:28 +0000 (02:41 -0700)]
fate: Split fate-pixdesc tests and dispatch them through Make

This allows running all the tests individually and/or in parallel.

4 weeks agoMerge commit 'd98e6c5d5d80c1dfe0c30f2e73d41a3aea0b920d'
Michael Niedermayer [Fri, 1 Aug 2014 01:36:17 +0000 (03:36 +0200)]
Merge commit 'd98e6c5d5d80c1dfe0c30f2e73d41a3aea0b920d'

* commit 'd98e6c5d5d80c1dfe0c30f2e73d41a3aea0b920d':
  pgssubdec: Check RLE size before copying

See: c0d68be555f5858703383040e04fcd6529777061
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 weeks agopgssubdec: Check RLE size before copying
Michael Niedermayer [Thu, 31 Jul 2014 01:31:19 +0000 (21:31 -0400)]
pgssubdec: Check RLE size before copying

Make sure the buffer size does not exceed the expected
RLE size.

Prevent an out of array bound write.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Bug-Id: CVE-2013-0852

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
4 weeks agodoc/indevs: mention required configure options
Lou Logan [Thu, 31 Jul 2014 22:44:59 +0000 (14:44 -0800)]
doc/indevs: mention required configure options

For x11grab, libcdio, and libdc1394 input devices.

Signed-off-by: Lou Logan <lou@lrcd.com>
4 weeks agox86/hevc_deblock: use existing x86util transpose macro in chroma_{10, 12}
James Almer [Tue, 29 Jul 2014 21:07:27 +0000 (18:07 -0300)]
x86/hevc_deblock: use existing x86util transpose macro in chroma_{10, 12}

Cosmetic change. No measurable difference in speed.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 weeks agoavdevice/oss_audio: Check SNDCTL_DSP_GETFMTS failure, print a warning but continue
Michael Niedermayer [Thu, 31 Jul 2014 19:01:07 +0000 (21:01 +0200)]
avdevice/oss_audio: Check SNDCTL_DSP_GETFMTS failure, print a warning but continue

Found-by: CSA and Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 weeks agoavfilter/trim: remove duplicate assignment
Michael Niedermayer [Thu, 31 Jul 2014 18:53:15 +0000 (20:53 +0200)]
avfilter/trim: remove duplicate assignment

Found-by: CSA
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 weeks agoavutil/pixdesc: remove unneeded assignment
Michael Niedermayer [Thu, 31 Jul 2014 18:44:46 +0000 (20:44 +0200)]
avutil/pixdesc: remove unneeded assignment

Found-by: CSA
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 weeks agoavcodec/diracdec: remove unneeded assignment
Michael Niedermayer [Thu, 31 Jul 2014 18:40:10 +0000 (20:40 +0200)]
avcodec/diracdec: remove unneeded assignment

Found-by: CSA
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 weeks agoavcodec/flac_parser: remove duplicate assignent
Michael Niedermayer [Thu, 31 Jul 2014 18:35:32 +0000 (20:35 +0200)]
avcodec/flac_parser: remove duplicate assignent

Found-by: CSA
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 weeks agoavcodec/ratecontrol: remove unneeded statement
Michael Niedermayer [Thu, 31 Jul 2014 18:27:19 +0000 (20:27 +0200)]
avcodec/ratecontrol: remove unneeded statement

Found-by: CSA
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 weeks agodict.c: minor simplification.
Reimar Döffinger [Tue, 29 Jul 2014 19:23:14 +0000 (21:23 +0200)]
dict.c: minor simplification.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
4 weeks agov4l2enc: adding AVClass
Anshul Maheswhwari [Thu, 31 Jul 2014 15:29:59 +0000 (20:59 +0530)]
v4l2enc: adding AVClass

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 weeks agolibavcodec/h264_parser: Increase parse_history, fix huge resolutions
Michael Niedermayer [Thu, 31 Jul 2014 14:25:21 +0000 (16:25 +0200)]
libavcodec/h264_parser: Increase parse_history, fix huge resolutions

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 weeks agoh264_mp4toannexb_bsf: account for consecutive IDR pictures.
Benoit Fouet [Thu, 31 Jul 2014 13:32:14 +0000 (15:32 +0200)]
h264_mp4toannexb_bsf: account for consecutive IDR pictures.

If there are consecutive IDR pictures, then SPS/PPS should be prepended
to all of them, not only the first one.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 weeks agoavcodec/dvdsubdec: free subtitle rectangles if nothing is output
Michael Niedermayer [Thu, 31 Jul 2014 12:06:12 +0000 (14:06 +0200)]
avcodec/dvdsubdec: free subtitle rectangles if nothing is output

Fixes assertion failure
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 weeks agoavcodec/resample: check for malloc failure
Michael Niedermayer [Thu, 31 Jul 2014 11:04:28 +0000 (13:04 +0200)]
avcodec/resample: check for malloc failure

Found-by: CSA
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 weeks agoavcodec/pthread_slice: Check for malloc failure
Michael Niedermayer [Thu, 31 Jul 2014 10:55:41 +0000 (12:55 +0200)]
avcodec/pthread_slice: Check for malloc failure

Found-by: CSA
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 weeks agoavcodec/mpeg4video_parser: Check for extradata parsing failure
Michael Niedermayer [Thu, 31 Jul 2014 03:20:42 +0000 (05:20 +0200)]
avcodec/mpeg4video_parser: Check for extradata parsing failure

Found-by: CSA
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 weeks agodoc: add very basic libcdio documentation
Gerion Entrup [Tue, 29 Jul 2014 23:53:32 +0000 (01:53 +0200)]
doc: add very basic libcdio documentation

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 weeks agoavformat/hlsenc: add some empty lines to make the code easier to read
Nicolas Martyanoff [Fri, 18 Jul 2014 08:57:42 +0000 (10:57 +0200)]
avformat/hlsenc: add some empty lines to make the code easier to read

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 weeks agoavformat/hlsenc: rename some identifers to make the code easier to read
Nicolas Martyanoff [Fri, 18 Jul 2014 08:57:42 +0000 (10:57 +0200)]
avformat/hlsenc: rename some identifers to make the code easier to read

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 weeks agoavformat/hlsenc: Add some comments to make the code easier to read
Nicolas Martyanoff [Fri, 18 Jul 2014 08:57:42 +0000 (10:57 +0200)]
avformat/hlsenc: Add some comments to make the code easier to read

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 weeks agoMerge commit 'a0ce85ac7de098d3f9b53b51b77a09bad700a011'
Michael Niedermayer [Wed, 30 Jul 2014 21:34:18 +0000 (23:34 +0200)]
Merge commit 'a0ce85ac7de098d3f9b53b51b77a09bad700a011'

* commit 'a0ce85ac7de098d3f9b53b51b77a09bad700a011':
  configure: Globally add ZLIB_CONST to CPPFLAGS if zlib is enabled

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 weeks agoconfigure: Globally add ZLIB_CONST to CPPFLAGS if zlib is enabled
Diego Biurrun [Wed, 30 Jul 2014 12:10:18 +0000 (05:10 -0700)]
configure: Globally add ZLIB_CONST to CPPFLAGS if zlib is enabled

4 weeks agomovdec: remove nonsensical snprintf.
Reimar Döffinger [Tue, 29 Jul 2014 19:13:10 +0000 (21:13 +0200)]
movdec: remove nonsensical snprintf.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
4 weeks agomxfdec: add missing "const" to array declaration.
Reimar Döffinger [Tue, 29 Jul 2014 18:17:28 +0000 (20:17 +0200)]
mxfdec: add missing "const" to array declaration.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
4 weeks agoffprobe: print some basic information about avframe side data
Michael Niedermayer [Wed, 29 Jan 2014 23:54:36 +0000 (00:54 +0100)]
ffprobe: print some basic information about avframe side data

Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 weeks agoavutil/frame: add av_frame_side_data_name()
Michael Niedermayer [Tue, 29 Jul 2014 23:09:06 +0000 (01:09 +0200)]
avutil/frame: add av_frame_side_data_name()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 weeks agoavfilter/f_select: avoid double->int in debug output
Michael Niedermayer [Wed, 30 Jul 2014 15:50:35 +0000 (17:50 +0200)]
avfilter/f_select: avoid double->int in debug output

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 weeks agoavfilter/f_select: Set var_values[VAR_KEY] correctly
Michael Niedermayer [Wed, 30 Jul 2014 15:48:33 +0000 (17:48 +0200)]
avfilter/f_select: Set var_values[VAR_KEY] correctly

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 weeks agoavfilter/f_select: avoid using doubles for equals checks and casts to enums
Michael Niedermayer [Wed, 30 Jul 2014 15:37:09 +0000 (17:37 +0200)]
avfilter/f_select: avoid using doubles for equals checks and casts to enums

This might silence some warnings.

Issue found from: a8d803a320fb08b3ad5db4fffc79abd401206905
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 weeks agoMerge commit 'a8d803a320fb08b3ad5db4fffc79abd401206905'
Michael Niedermayer [Wed, 30 Jul 2014 15:32:15 +0000 (17:32 +0200)]
Merge commit 'a8d803a320fb08b3ad5db4fffc79abd401206905'

* commit 'a8d803a320fb08b3ad5db4fffc79abd401206905':
  vf_select: Drop a debug av_log with an unchecked double to enum conversion

Conflicts:
libavfilter/f_select.c

Not merged, see next commit for the bugfix

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 weeks agoffmpeg_filter: refuse to configure input without a decoder.
Nicolas George [Fri, 18 Jul 2014 08:34:39 +0000 (10:34 +0200)]
ffmpeg_filter: refuse to configure input without a decoder.

The decoder is necessary in order to filter frames.
This makes the error message clearer in this case:
currently, it will usually fail because the pixel or sample
format is not defined and is converted into "(null)"
(non-portable).

Enhance trac ticket #3779.

4 weeks agoAdd int64_t probesize2 instead of int probesize to AVFormatContext.
Carl Eugen Hoyos [Wed, 30 Jul 2014 09:09:25 +0000 (11:09 +0200)]
Add int64_t probesize2 instead of int probesize to AVFormatContext.

Allows to set a probesize >2G.
Tested-by: Oliver Fromme
4 weeks agolavf/mux: Fix a typo checking aspect ratios.
Carl Eugen Hoyos [Wed, 30 Jul 2014 09:03:29 +0000 (11:03 +0200)]
lavf/mux: Fix a typo checking aspect ratios.

Fixes ticket #3813.

4 weeks agoavformat/movenc: add m4b to list of ipod playable files
gerion.entrup@t-online.de [Wed, 30 Jul 2014 02:19:15 +0000 (04:19 +0200)]
avformat/movenc: add m4b to list of ipod playable files

m4b is the extension used by iDevices to detect audiobooks.

4 weeks agoMerge "GN: Remove ffmpegsumo_copy step"
James Robinson [Tue, 29 Jul 2014 23:05:20 +0000 (16:05 -0700)]
Merge "GN: Remove ffmpegsumo_copy step"

4 weeks agox86: hevc_mc: fix register count usage
Christophe Gisquet [Mon, 28 Jul 2014 09:48:21 +0000 (11:48 +0200)]
x86: hevc_mc: fix register count usage

A macro was using a fixed register, causing too many GPRs to be
declared as used.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 weeks agoavformat/format: fix memleak and error code
Michael Niedermayer [Tue, 29 Jul 2014 19:38:15 +0000 (21:38 +0200)]
avformat/format: fix memleak and error code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 weeks agoavformat/format.c: remove duplicate include, put libavutil includes together
Michael Niedermayer [Tue, 29 Jul 2014 19:35:07 +0000 (21:35 +0200)]
avformat/format.c: remove duplicate include, put libavutil includes together

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 weeks agoavformat/format: simplify ifdeffery
Michael Niedermayer [Tue, 29 Jul 2014 19:33:10 +0000 (21:33 +0200)]
avformat/format: simplify ifdeffery

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 weeks agoMerge commit 'ccbf370f2000b9b27f4af259c23007d67f7ea46e'
Michael Niedermayer [Tue, 29 Jul 2014 19:26:27 +0000 (21:26 +0200)]
Merge commit 'ccbf370f2000b9b27f4af259c23007d67f7ea46e'

* commit 'ccbf370f2000b9b27f4af259c23007d67f7ea46e':
  mpegvideo: move vol_control_parameters to the only place it is used

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 weeks agoMerge commit 'fa38573cd9ce4ab727f86f57c03b113cfd4c9d0a'
Michael Niedermayer [Tue, 29 Jul 2014 19:17:41 +0000 (21:17 +0200)]
Merge commit 'fa38573cd9ce4ab727f86f57c03b113cfd4c9d0a'

* commit 'fa38573cd9ce4ab727f86f57c03b113cfd4c9d0a':
  matroska: Register mime types

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 weeks agoMerge commit '02cf0c9e42967de1e4d2803bee3573bc5b735fdd'
Michael Niedermayer [Tue, 29 Jul 2014 19:11:03 +0000 (21:11 +0200)]
Merge commit '02cf0c9e42967de1e4d2803bee3573bc5b735fdd'

* commit '02cf0c9e42967de1e4d2803bee3573bc5b735fdd':
  aac: Register the mime type

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 weeks agoavformat: fix probe mime version checks
Michael Niedermayer [Tue, 29 Jul 2014 19:02:48 +0000 (21:02 +0200)]
avformat: fix probe mime version checks

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 weeks agoMerge commit '3a19405d574a467c68b48e4b824c76617fd59de0'
Michael Niedermayer [Tue, 29 Jul 2014 18:57:42 +0000 (20:57 +0200)]
Merge commit '3a19405d574a467c68b48e4b824c76617fd59de0'

* commit '3a19405d574a467c68b48e4b824c76617fd59de0':
  avformat: Use the mime type information in input probe

Conflicts:
libavformat/format.c
libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 weeks agoMerge commit '69e7336b8e16ee65226fc20381baf537f4b125e6'
Michael Niedermayer [Tue, 29 Jul 2014 18:09:15 +0000 (20:09 +0200)]
Merge commit '69e7336b8e16ee65226fc20381baf537f4b125e6'

* commit '69e7336b8e16ee65226fc20381baf537f4b125e6':
  avstring: Expose the simple name match function

Conflicts:
libavutil/avstring.c
libavutil/avstring.h
libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 weeks agoMerge commit 'e253a9e2b3d683eb51db7c776326eb07de10ad4c'
Michael Niedermayer [Tue, 29 Jul 2014 17:55:15 +0000 (19:55 +0200)]
Merge commit 'e253a9e2b3d683eb51db7c776326eb07de10ad4c'

* commit 'e253a9e2b3d683eb51db7c776326eb07de10ad4c':
  avformat: Move av_probe_input* to format.c

Conflicts:
libavformat/format.c
libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 weeks agovf_select: Drop a debug av_log with an unchecked double to enum conversion
Diego Biurrun [Tue, 29 Jul 2014 12:43:04 +0000 (05:43 -0700)]
vf_select: Drop a debug av_log with an unchecked double to enum conversion

CC: libav-stable@libav.org
4 weeks agompegvideo: move vol_control_parameters to the only place it is used
Nidhi Makhijani [Tue, 29 Jul 2014 15:54:29 +0000 (21:24 +0530)]
mpegvideo: move vol_control_parameters to the only place it is used

Signed-off-by: Diego Biurrun <diego@biurrun.de>
4 weeks agomatroska: Register mime types
Luca Barbato [Thu, 13 Mar 2014 21:14:43 +0000 (22:14 +0100)]
matroska: Register mime types

4 weeks agoaac: Register the mime type
Luca Barbato [Thu, 13 Mar 2014 21:12:18 +0000 (22:12 +0100)]
aac: Register the mime type

Speed up probing ADTS live streams that are not frame-aligned such
as http://mp3.streampower.be/radio1.aac .

4 weeks agoavformat: Use the mime type information in input probe
Luca Barbato [Thu, 13 Mar 2014 21:11:12 +0000 (22:11 +0100)]
avformat: Use the mime type information in input probe

It should provide a quicker guess for elementary streams provided
by http.

4 weeks agoavstring: Expose the simple name match function
Luca Barbato [Tue, 29 Jul 2014 13:29:13 +0000 (14:29 +0100)]
avstring: Expose the simple name match function

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>