ffmpeg.git
7 years agox11: Fix x11grab BadCursor
Isaac Dooley [Tue, 23 Oct 2012 19:39:56 +0000 (21:39 +0200)]
x11: Fix x11grab BadCursor

Fixes Ticket1738

Based-on: A fix found in a perl module (http://ffmpeg.org/pipermail/ffmpeg-user/2012-August/008804.html)
Reviewed-by: Clemens Fruhwirth <clemens@endorphin.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agopnmdec: use more meaningful error codes
Paul B Mahol [Mon, 22 Oct 2012 22:00:41 +0000 (22:00 +0000)]
pnmdec: use more meaningful error codes

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agolavf: fix duration estimation for multi program TS
Michael Niedermayer [Tue, 23 Oct 2012 16:11:26 +0000 (18:11 +0200)]
lavf: fix duration estimation for multi program TS

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavf: increase retries to guess duration from pts by 1
Michael Niedermayer [Tue, 23 Oct 2012 14:53:48 +0000 (16:53 +0200)]
lavf: increase retries to guess duration from pts by 1

This fixes finding the duration for one TS file

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoasfdec: ignore stored duration for truncated files
Michael Niedermayer [Tue, 23 Oct 2012 14:11:38 +0000 (16:11 +0200)]
asfdec: ignore stored duration for truncated files

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agowtvdec: display warning for encrypted wtv files (instead of 'unsupported chunk' messages)
Peter Ross [Tue, 23 Oct 2012 10:06:28 +0000 (21:06 +1100)]
wtvdec: display warning for encrypted wtv files (instead of 'unsupported chunk' messages)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 23 Oct 2012 13:12:09 +0000 (15:12 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  fate: check that dependencies actually exist
  fate: fix ENCMUX macro

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'ec444c84cfd30ef34a4e7b4ec7ee77d7e5250d25'
Michael Niedermayer [Tue, 23 Oct 2012 13:08:55 +0000 (15:08 +0200)]
Merge commit 'ec444c84cfd30ef34a4e7b4ec7ee77d7e5250d25'

* commit 'ec444c84cfd30ef34a4e7b4ec7ee77d7e5250d25':
  mpegaudiodec: Fix buffer handling on random access
  mpegaudio: Refactor mp3on4 flush function
  fate: Add dependencies for audio tests
  fate: cosmetics: Group idct8x8 test together with all other libavcodec tests
  fate: More fine-grained dependencies for libavcodec test programs

Conflicts:
tests/fate/audio.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '8b8899ac3233b4f7af83ded0dc032fad8902d714'
Michael Niedermayer [Tue, 23 Oct 2012 13:00:27 +0000 (15:00 +0200)]
Merge commit '8b8899ac3233b4f7af83ded0dc032fad8902d714'

* commit '8b8899ac3233b4f7af83ded0dc032fad8902d714':
  fate: Declare avcodec/avformat deps in the respective Makefile snippets
  fate: Add dependencies for WMA and WavPack tests
  Improve wording and spelling of av_log_missing_feature messages.
  lavu: remove disabled FF_API_AV_FIFO_PEEK cruft

Conflicts:
libavcodec/aacsbr.c
libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'c692957c4edd119920cd7f2121628dd183589e6a'
Michael Niedermayer [Tue, 23 Oct 2012 12:50:31 +0000 (14:50 +0200)]
Merge commit 'c692957c4edd119920cd7f2121628dd183589e6a'

* commit 'c692957c4edd119920cd7f2121628dd183589e6a':
  lavu: remove disabled avoptions cruft
  lavu: remove disabled FF_API_GET_BITS_PER_SAMPLE_FMT cruft

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '468ea9d5b14f92fe61f47f034e67066f65163f5f'
Michael Niedermayer [Tue, 23 Oct 2012 11:34:42 +0000 (13:34 +0200)]
Merge commit '468ea9d5b14f92fe61f47f034e67066f65163f5f'

* commit '468ea9d5b14f92fe61f47f034e67066f65163f5f':
  Revert "avutil: make some tables visible again"
  Revert "avutil: Add a copy of ff_sqrt_tab back into avutil to restore ABI compatibility"

Conflicts:
libavcodec/sqrt_tab.c
libavutil/libavutil.v

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'add3a6902ea4d459f36655656a1f8daa409118a7'
Michael Niedermayer [Tue, 23 Oct 2012 11:13:18 +0000 (13:13 +0200)]
Merge commit 'add3a6902ea4d459f36655656a1f8daa409118a7'

* commit 'add3a6902ea4d459f36655656a1f8daa409118a7':
  lavu: bump major to 52

Conflicts:
libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '2b8dd371e4d276ca0d342e82b8b4cc281be0630a'
Michael Niedermayer [Tue, 23 Oct 2012 11:05:52 +0000 (13:05 +0200)]
Merge commit '2b8dd371e4d276ca0d342e82b8b4cc281be0630a'

* commit '2b8dd371e4d276ca0d342e82b8b4cc281be0630a':
  lavu: postpone recent deprecations until the next major bump
  APIchanges: update lavr bump date
  avconv: only apply presets when we have an encoder.
  atrac3: replace a calculation with FFALIGN()
  atrac3: remove unused ATRAC3Context field, sample_rate
  atrac3: use sizeof(variable) instead of sizeof(type)
  atrac3: simplify MDCT window calculation

Conflicts:
doc/APIchanges

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '5d1007f74dd496d54b932242004382f44e3b22b4'
Michael Niedermayer [Tue, 23 Oct 2012 10:51:13 +0000 (12:51 +0200)]
Merge commit '5d1007f74dd496d54b932242004382f44e3b22b4'

* commit '5d1007f74dd496d54b932242004382f44e3b22b4':
  atrac3: initialize static tables in AVCodec.init_static_data()
  atrac3: separate window initialization from IMDCT initialization
  atrac3: move the 'frame_factor' field from ATRAC3Context to where it is used
  atrac3: remove unused ATRAC3Context field, bit_rate

Conflicts:
libavcodec/atrac3.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'a2664c91fba15a1307f676ffad511f8f86fb3a27'
Michael Niedermayer [Tue, 23 Oct 2012 10:41:02 +0000 (12:41 +0200)]
Merge commit 'a2664c91fba15a1307f676ffad511f8f86fb3a27'

* commit 'a2664c91fba15a1307f676ffad511f8f86fb3a27':
  atrac3: move the 'samples_per_frame' field from ATRAC3Context to where it is used
  atrac3: remove unused ATRAC3Context field, samples_per_channel
  atrac3: use AVCodecContext.block_align instead of keeping a private copy
  atrac3: move the 'delay' field from ATRAC3Context to where it is used
  atrac3: move the 'version' field from ATRAC3Context to where it is used

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '5ac673b5531d846b79a3d77e3e932e0cb1234c45'
Michael Niedermayer [Tue, 23 Oct 2012 10:36:16 +0000 (12:36 +0200)]
Merge commit '5ac673b5531d846b79a3d77e3e932e0cb1234c45'

* commit '5ac673b5531d846b79a3d77e3e932e0cb1234c45':
  atrac3: use AVCodecContext.channels instead of keeping a private copy
  atrac3: simplify some loop indexing
  atrac3: cosmetics: pretty-printing and renaming
  pcm: define AVCodec instances only for enabled codecs
  libxvid: remove useless doxy comments.
  lavc: remove stats_out from the options table.

Conflicts:
libavcodec/atrac3.c
libavcodec/pcm.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agofate: check that dependencies actually exist
Mans Rullgard [Tue, 23 Oct 2012 02:28:08 +0000 (03:28 +0100)]
fate: check that dependencies actually exist

This causes make to exit with an error message if a nonexistent
dependency is specified rather than silently dropping the test.

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agofate: fix ENCMUX macro
Mans Rullgard [Tue, 23 Oct 2012 02:23:43 +0000 (03:23 +0100)]
fate: fix ENCMUX macro

This matches how it is actually being called.

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agompegaudiodec: Fix buffer handling on random access
Michael Niedermayer [Sun, 21 Oct 2012 18:48:21 +0000 (20:48 +0200)]
mpegaudiodec: Fix buffer handling on random access

7 years agompegaudio: Refactor mp3on4 flush function
Diego Biurrun [Mon, 22 Oct 2012 14:55:23 +0000 (16:55 +0200)]
mpegaudio: Refactor mp3on4 flush function

7 years agofate: Add dependencies for audio tests
Diego Biurrun [Fri, 19 Oct 2012 23:14:11 +0000 (01:14 +0200)]
fate: Add dependencies for audio tests

7 years agofate: cosmetics: Group idct8x8 test together with all other libavcodec tests
Diego Biurrun [Sat, 20 Oct 2012 14:12:30 +0000 (16:12 +0200)]
fate: cosmetics: Group idct8x8 test together with all other libavcodec tests

7 years agofate: Declare avcodec/avformat deps in the respective Makefile snippets
Diego Biurrun [Sat, 20 Oct 2012 19:58:43 +0000 (21:58 +0200)]
fate: Declare avcodec/avformat deps in the respective Makefile snippets

7 years agofate: More fine-grained dependencies for libavcodec test programs
Diego Biurrun [Fri, 19 Oct 2012 17:59:20 +0000 (19:59 +0200)]
fate: More fine-grained dependencies for libavcodec test programs

7 years agofate: Add dependencies for WMA and WavPack tests
Diego Biurrun [Fri, 19 Oct 2012 14:26:15 +0000 (16:26 +0200)]
fate: Add dependencies for WMA and WavPack tests

7 years agoImprove wording and spelling of av_log_missing_feature messages.
Diego Biurrun [Mon, 22 Oct 2012 12:35:13 +0000 (14:35 +0200)]
Improve wording and spelling of av_log_missing_feature messages.

7 years agolavu: remove disabled avoptions cruft
Anton Khirnov [Mon, 22 Oct 2012 12:39:43 +0000 (14:39 +0200)]
lavu: remove disabled avoptions cruft

7 years agoRevert "avutil: make some tables visible again"
Anton Khirnov [Mon, 22 Oct 2012 07:15:11 +0000 (09:15 +0200)]
Revert "avutil: make some tables visible again"

This reverts commit def8c94699877d015154a03d43e2b8f479cd89a0.

After the major bump this is no longer necessary.

7 years agolavu: bump major to 52
Anton Khirnov [Mon, 22 Oct 2012 07:12:03 +0000 (09:12 +0200)]
lavu: bump major to 52

In addition to the recent tables mess, the AVOption defaults behavior
changed, so an old lavc used with a new lavu will get completely messed
up defaults.

7 years agolavu: postpone recent deprecations until the next major bump
Anton Khirnov [Mon, 22 Oct 2012 07:11:41 +0000 (09:11 +0200)]
lavu: postpone recent deprecations until the next major bump

7 years agolavu: remove disabled FF_API_AV_FIFO_PEEK cruft
Anton Khirnov [Mon, 22 Oct 2012 12:40:32 +0000 (14:40 +0200)]
lavu: remove disabled FF_API_AV_FIFO_PEEK cruft

7 years agolavu: remove disabled FF_API_GET_BITS_PER_SAMPLE_FMT cruft
Anton Khirnov [Mon, 22 Oct 2012 12:36:14 +0000 (14:36 +0200)]
lavu: remove disabled FF_API_GET_BITS_PER_SAMPLE_FMT cruft

7 years agoRevert "avutil: Add a copy of ff_sqrt_tab back into avutil to restore ABI compatibility"
Anton Khirnov [Mon, 22 Oct 2012 07:14:43 +0000 (09:14 +0200)]
Revert "avutil: Add a copy of ff_sqrt_tab back into avutil to restore ABI compatibility"

This reverts commit d15c21e5fa3961f10026da1a3080a3aa3cf4cec9.

After the major bump this is no longer necessary.

7 years agoAPIchanges: update lavr bump date
Anton Khirnov [Mon, 22 Oct 2012 07:02:28 +0000 (09:02 +0200)]
APIchanges: update lavr bump date

7 years agoavconv: only apply presets when we have an encoder.
Anton Khirnov [Mon, 22 Oct 2012 20:40:22 +0000 (22:40 +0200)]
avconv: only apply presets when we have an encoder.

Fixes a crash when using a preset with stream copy.

CC: libav-stable@libav.org
7 years agog723_1: remove unneeded cliping
Michael Niedermayer [Mon, 22 Oct 2012 23:41:40 +0000 (01:41 +0200)]
g723_1: remove unneeded cliping

Fixes CID703731
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agog722dec: s/Libav/FFmpeg/ The copyright years predate the existence of Libav
Michael Niedermayer [Mon, 22 Oct 2012 22:33:23 +0000 (00:33 +0200)]
g722dec: s/Libav/FFmpeg/ The copyright years predate the existence of Libav

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agofate/mapchan: add bitexact flag
Michael Niedermayer [Tue, 23 Oct 2012 00:18:36 +0000 (02:18 +0200)]
fate/mapchan: add bitexact flag

fixes fate breakage

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoLVF demuxer
Paul B Mahol [Thu, 18 Oct 2012 12:34:46 +0000 (12:34 +0000)]
LVF demuxer

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoffmpeg: check avpicture_get_size() retuen value
Michael Niedermayer [Mon, 22 Oct 2012 22:22:23 +0000 (00:22 +0200)]
ffmpeg: check avpicture_get_size() retuen value

Fixes CID205018
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoj2k: reorder multiplications to avoid interger overflows related to precincts
Michael Niedermayer [Mon, 22 Oct 2012 21:56:14 +0000 (23:56 +0200)]
j2k: reorder multiplications to avoid interger overflows related to precincts

Fixes CID703778, CID703777
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoj2k: reorder multiplications to avoid interger overflows related to code blocks
Michael Niedermayer [Mon, 22 Oct 2012 21:56:14 +0000 (23:56 +0200)]
j2k: reorder multiplications to avoid interger overflows related to code blocks

Fixes CID703776, CID703775
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agofate: quote file paths in movie/amovie filtergraphs.
Clément Bœsch [Mon, 22 Oct 2012 21:01:08 +0000 (23:01 +0200)]
fate: quote file paths in movie/amovie filtergraphs.

This should avoid some nasty ':' escaping.

7 years agofate: improve metadata filter deps readability.
Clément Bœsch [Mon, 22 Oct 2012 20:12:19 +0000 (22:12 +0200)]
fate: improve metadata filter deps readability.

7 years agofate: add scale filter to the scene detect dependencies.
Clément Bœsch [Mon, 22 Oct 2012 05:58:46 +0000 (07:58 +0200)]
fate: add scale filter to the scene detect dependencies.

The select filter requires some conversion to rgb24 for the scene
detection.

7 years agofate: fix SAMPLES dependency for ffprobe.
Clément Bœsch [Mon, 22 Oct 2012 05:56:00 +0000 (07:56 +0200)]
fate: fix SAMPLES dependency for ffprobe.

FATE_SAMPLES_FFPROBE is a different list than FATE_FFPROBE, the same way
FATE_SAMPLES_FFMPEG is a different list than FATE_FFMPEG; these
FATE_SAMPLES_<tool> lists are in the FATE_EXTERN list, which is only
used when SAMPLES is set.

7 years agoqt-faststart: check fseeko() return codes
Michael Niedermayer [Mon, 22 Oct 2012 20:42:51 +0000 (22:42 +0200)]
qt-faststart: check fseeko() return codes

Fixes CID733725

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agocmdutils: apply option to codec and format contexts if possible.
Michael Niedermayer [Wed, 17 Oct 2012 23:56:48 +0000 (01:56 +0200)]
cmdutils: apply option to codec and format contexts if possible.

This is needed for setting both contexts -err_detect at once.

Reviewed-by: Clément Bœsch <ubitux@gmail.com>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavf/aiffdec: don't stop parsing after SSND chunk
Matthieu Bouron [Sat, 30 Jun 2012 15:53:38 +0000 (17:53 +0200)]
lavf/aiffdec: don't stop parsing after SSND chunk

Some file has ID3 chunk placed after SSND.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodv: fix a check on dv_extract_timecode return value
Matthieu Bouron [Mon, 22 Oct 2012 17:08:26 +0000 (19:08 +0200)]
dv: fix a check on dv_extract_timecode return value

Fixes CID733808

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffmpeg/lavc: move experimental warnings to libavcodec.
Michael Niedermayer [Mon, 22 Oct 2012 15:58:33 +0000 (17:58 +0200)]
ffmpeg/lavc: move experimental warnings to libavcodec.

This way they are available to all applications and not just ffmpeg

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoatrac3: initialize static tables in AVCodec.init_static_data()
Justin Ruggles [Fri, 19 Oct 2012 03:04:03 +0000 (23:04 -0400)]
atrac3: initialize static tables in AVCodec.init_static_data()

7 years agoatrac3: replace a calculation with FFALIGN()
Justin Ruggles [Fri, 19 Oct 2012 03:51:37 +0000 (23:51 -0400)]
atrac3: replace a calculation with FFALIGN()

This allocates 4 bytes less than the previous code if avctx->block_align is
a multiple of 4, but the extra 4 bytes is not really needed.

7 years agoatrac3: separate window initialization from IMDCT initialization
Justin Ruggles [Fri, 19 Oct 2012 02:56:10 +0000 (22:56 -0400)]
atrac3: separate window initialization from IMDCT initialization

7 years agoatrac3: remove unused ATRAC3Context field, sample_rate
Justin Ruggles [Fri, 19 Oct 2012 03:34:40 +0000 (23:34 -0400)]
atrac3: remove unused ATRAC3Context field, sample_rate

7 years agoatrac3: move the 'frame_factor' field from ATRAC3Context to where it is used
Justin Ruggles [Fri, 19 Oct 2012 02:53:13 +0000 (22:53 -0400)]
atrac3: move the 'frame_factor' field from ATRAC3Context to where it is used

7 years agoatrac3: use sizeof(variable) instead of sizeof(type)
Justin Ruggles [Fri, 19 Oct 2012 03:25:44 +0000 (23:25 -0400)]
atrac3: use sizeof(variable) instead of sizeof(type)

7 years agoatrac3: simplify MDCT window calculation
Justin Ruggles [Fri, 19 Oct 2012 03:11:20 +0000 (23:11 -0400)]
atrac3: simplify MDCT window calculation

7 years agoatrac3: move the 'samples_per_frame' field from ATRAC3Context to where it is used
Justin Ruggles [Fri, 19 Oct 2012 02:50:40 +0000 (22:50 -0400)]
atrac3: move the 'samples_per_frame' field from ATRAC3Context to where it is used

7 years agoatrac3: remove unused ATRAC3Context field, bit_rate
Justin Ruggles [Fri, 19 Oct 2012 02:51:41 +0000 (22:51 -0400)]
atrac3: remove unused ATRAC3Context field, bit_rate

7 years agoatrac3: remove unused ATRAC3Context field, samples_per_channel
Justin Ruggles [Fri, 19 Oct 2012 02:48:45 +0000 (22:48 -0400)]
atrac3: remove unused ATRAC3Context field, samples_per_channel

7 years agoatrac3: use AVCodecContext.block_align instead of keeping a private copy
Justin Ruggles [Fri, 19 Oct 2012 02:45:48 +0000 (22:45 -0400)]
atrac3: use AVCodecContext.block_align instead of keeping a private copy

7 years agoatrac3: move the 'delay' field from ATRAC3Context to where it is used
Justin Ruggles [Fri, 19 Oct 2012 02:42:21 +0000 (22:42 -0400)]
atrac3: move the 'delay' field from ATRAC3Context to where it is used

7 years agoatrac3: use AVCodecContext.channels instead of keeping a private copy
Justin Ruggles [Thu, 18 Oct 2012 21:13:22 +0000 (17:13 -0400)]
atrac3: use AVCodecContext.channels instead of keeping a private copy

7 years agoatrac3: move the 'version' field from ATRAC3Context to where it is used
Justin Ruggles [Thu, 18 Oct 2012 21:14:59 +0000 (17:14 -0400)]
atrac3: move the 'version' field from ATRAC3Context to where it is used

7 years agoatrac3: simplify some loop indexing
Justin Ruggles [Thu, 18 Oct 2012 21:07:04 +0000 (17:07 -0400)]
atrac3: simplify some loop indexing

7 years agoatrac3: cosmetics: pretty-printing and renaming
Justin Ruggles [Wed, 17 Oct 2012 15:59:40 +0000 (11:59 -0400)]
atrac3: cosmetics: pretty-printing and renaming

also does some minor refactoring.

7 years agopcm: define AVCodec instances only for enabled codecs
Mans Rullgard [Wed, 17 Oct 2012 21:26:55 +0000 (22:26 +0100)]
pcm: define AVCodec instances only for enabled codecs

This defines an AVCodec only if the corresponding CONFIG option is
enabled instead of using the broad CONFIG_ENCODERS/DECODERS.

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agolibxvid: remove useless doxy comments.
Anton Khirnov [Mon, 22 Oct 2012 13:20:23 +0000 (15:20 +0200)]
libxvid: remove useless doxy comments.

7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 22 Oct 2012 12:50:00 +0000 (14:50 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  riff: remove a write-only variable
  lavc: extend frame_size doxy.
  alacdec: set bits_per_raw_sample

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavc: remove stats_out from the options table.
Anton Khirnov [Fri, 19 Oct 2012 18:39:27 +0000 (20:39 +0200)]
lavc: remove stats_out from the options table.

Since it is declared as a string AVOption, the generic freeing code
attempts to free it on codec close. Some codecs might have already freed
it elsewhere (or didn't even allocate it with av_malloc() in the first
place), so this might lead to an invalid free.

There is no point in having this field accessible as an AVOption, so
remove it from the options table.

Fixes Bug 380.

CC: libav-stable@libav.org
7 years agoMerge commit 'c3e15f7b39aac2012f09ee4ca86d2bc674ffdbd4'
Michael Niedermayer [Mon, 22 Oct 2012 12:39:12 +0000 (14:39 +0200)]
Merge commit 'c3e15f7b39aac2012f09ee4ca86d2bc674ffdbd4'

* commit 'c3e15f7b39aac2012f09ee4ca86d2bc674ffdbd4':
  rtpdec: Don't pass a non-AVClass pointer as log context
  rtsp: Update a comment to the current filename scheme
  avcodec: handle AVERROR_EXPERIMENTAL
  avutil: Add AVERROR_EXPERIMENTAL
  avcodec: prefer decoders without CODEC_CAP_EXPERIMENTAL

Conflicts:
doc/APIchanges
ffmpeg.c
libavcodec/utils.c
libavformat/rtpdec.c
libavutil/error.c
libavutil/error.h
libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffmpeg: fix negative array index
Michael Niedermayer [Mon, 22 Oct 2012 11:58:19 +0000 (13:58 +0200)]
ffmpeg: fix negative array index

Fixes CID733808
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agovf_aspect: unbreak avoption system
Michael Niedermayer [Mon, 22 Oct 2012 11:12:15 +0000 (13:12 +0200)]
vf_aspect: unbreak avoption system

This fixes ff* -h infinite looping

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavfi/aspect: add max option
Stefano Sabatini [Tue, 16 Oct 2012 16:10:59 +0000 (18:10 +0200)]
lavfi/aspect: add max option

7 years agolavfi/aspect: extend syntax for the setdar and setsar filters
Stefano Sabatini [Tue, 24 Jan 2012 22:20:23 +0000 (23:20 +0100)]
lavfi/aspect: extend syntax for the setdar and setsar filters

Add support for named options, and deprecate old "num:den" ambiguous
syntax.

7 years agolavu/parseutils: remove unused gcd variable in av_parse_ratio()
Stefano Sabatini [Mon, 22 Oct 2012 08:24:04 +0000 (10:24 +0200)]
lavu/parseutils: remove unused gcd variable in av_parse_ratio()

Fix warning.

7 years agolavf/flacenc: disallow creation of invalid files with -c copy
Paul B Mahol [Sat, 20 Oct 2012 22:16:13 +0000 (22:16 +0000)]
lavf/flacenc: disallow creation of invalid files with -c copy

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoriff: remove a write-only variable
Anton Khirnov [Wed, 17 Oct 2012 04:39:13 +0000 (06:39 +0200)]
riff: remove a write-only variable

7 years agolavc: extend frame_size doxy.
Anton Khirnov [Wed, 17 Oct 2012 05:17:24 +0000 (07:17 +0200)]
lavc: extend frame_size doxy.

7 years agoalacdec: set bits_per_raw_sample
Justin Ruggles [Sun, 21 Oct 2012 23:18:07 +0000 (19:18 -0400)]
alacdec: set bits_per_raw_sample

7 years agortpdec: Don't pass a non-AVClass pointer as log context
Martin Storsjö [Sat, 20 Oct 2012 20:29:15 +0000 (23:29 +0300)]
rtpdec: Don't pass a non-AVClass pointer as log context

The log context is assumed to start with an AVClass pointer.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agortsp: Update a comment to the current filename scheme
Martin Storsjö [Sat, 20 Oct 2012 20:04:14 +0000 (23:04 +0300)]
rtsp: Update a comment to the current filename scheme

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agofate: fix fate-filter-metadata-scenedetect
Michael Niedermayer [Sun, 21 Oct 2012 22:05:14 +0000 (00:05 +0200)]
fate: fix fate-filter-metadata-scenedetect

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavfilter_graph_parse: add support for parsing sws_flags
Michael Niedermayer [Sun, 21 Oct 2012 21:52:54 +0000 (23:52 +0200)]
avfilter_graph_parse: add support for parsing sws_flags

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoFix various uses of av_log_missing_feature()
Michael Niedermayer [Sun, 21 Oct 2012 21:13:53 +0000 (23:13 +0200)]
Fix various uses of av_log_missing_feature()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec: handle AVERROR_EXPERIMENTAL
Nathan Caldwell [Fri, 19 Oct 2012 04:58:25 +0000 (22:58 -0600)]
avcodec: handle AVERROR_EXPERIMENTAL

Error out on init if a codec with CODEC_CAP_EXPERIMENTAL is requested
and strict_std_compliance is not FF_COMPLIANCE_EXPERIMENTAL.

Move the check from avconv to avcodec_open2() and return
AVERROR_EXPERIMENTAL accordingly.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
7 years agoavutil: Add AVERROR_EXPERIMENTAL
Nathan Caldwell [Fri, 19 Oct 2012 04:59:04 +0000 (22:59 -0600)]
avutil: Add AVERROR_EXPERIMENTAL

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
7 years agoavcodec: prefer decoders without CODEC_CAP_EXPERIMENTAL
Nathan Caldwell [Thu, 18 Oct 2012 20:47:38 +0000 (14:47 -0600)]
avcodec: prefer decoders without CODEC_CAP_EXPERIMENTAL

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
7 years agolavfi/avfiltergraph: avoid to print "(null)" in the scale args
Stefano Sabatini [Wed, 17 Oct 2012 08:14:15 +0000 (10:14 +0200)]
lavfi/avfiltergraph: avoid to print "(null)" in the scale args

Fix parsing.

7 years agolavfi/graphparser: fix parsing error in case of NULL sws_opts addition
Stefano Sabatini [Mon, 15 Oct 2012 08:18:13 +0000 (10:18 +0200)]
lavfi/graphparser: fix parsing error in case of NULL sws_opts addition

If sws_opts was NULL it was resulting in the args being set to
"W:H:(null)", which with the new parsing code was generating a syntax
failure.

7 years agolavc/utils: provide more feedback in case of experimental codec
Stefano Sabatini [Sat, 20 Oct 2012 12:50:10 +0000 (14:50 +0200)]
lavc/utils: provide more feedback in case of experimental codec

7 years agompegaudiodec: Fix buffer handling on random access
Michael Niedermayer [Sun, 21 Oct 2012 18:48:21 +0000 (20:48 +0200)]
mpegaudiodec: Fix buffer handling on random access

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodoc/muxers: document mov faststart option.
Clément Bœsch [Sun, 21 Oct 2012 13:21:21 +0000 (15:21 +0200)]
doc/muxers: document mov faststart option.

7 years agofate: fix filter metadata dependency to ffprobe.
Clément Bœsch [Sun, 21 Oct 2012 18:10:37 +0000 (20:10 +0200)]
fate: fix filter metadata dependency to ffprobe.

7 years agoImprove MPEG-PS-in-MOV detection.
Carl Eugen Hoyos [Sun, 21 Oct 2012 17:30:43 +0000 (19:30 +0200)]
Improve MPEG-PS-in-MOV detection.

Fixes issue 1520.

7 years agoMerge remote-tracking branch 'cus/stable'
Michael Niedermayer [Sun, 21 Oct 2012 16:56:50 +0000 (18:56 +0200)]
Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffplay: if there is no audio stream, use external clock by default
  ffplay: use get_master_sync_type where necessary
  ffplay: add get_master_sync_type function
  ffplay: only check external clock if current frame serial matches the displayed frame serial
  ffplay: add serial field to PacketQueue entry and populate it
  ffplay: fix external time sync mode
  ffplay: initialize audio and video pts drift
  ffplay: fix nosync threshold check in synchronize_audio
  ffplay: use framedrop by default when sync is not done to video

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoh264: add support for AFD detection
Marton Balint [Sun, 14 Oct 2012 17:17:22 +0000 (19:17 +0200)]
h264: add support for AFD detection

Signed-off-by: Marton Balint <cus@passwd.hu>
Reviewed-by: Kieran Kunhya <kierank@ob-encoder.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolibavformat/oggenc: add {} to complex ifs
Michael Niedermayer [Sun, 21 Oct 2012 15:37:15 +0000 (17:37 +0200)]
libavformat/oggenc: add {} to complex ifs

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolibavformat/mxfenc: add {} to complex ifs
Michael Niedermayer [Sun, 21 Oct 2012 15:36:53 +0000 (17:36 +0200)]
libavformat/mxfenc: add {} to complex ifs

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