ffmpeg.git
6 years agoMerge commit '6599b087de62a5f9f2a8d61a1952d777d1bff804'
Michael Niedermayer [Wed, 20 Mar 2013 10:30:49 +0000 (11:30 +0100)]
Merge commit '6599b087de62a5f9f2a8d61a1952d777d1bff804'

* commit '6599b087de62a5f9f2a8d61a1952d777d1bff804':
  buffersrc: fix a typo.
  lavc, lavfi: fix counting number of planes in AVBufferRef wrappers

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '2c328a907978b61949fd20f7c991803174337855'
Michael Niedermayer [Wed, 20 Mar 2013 10:24:11 +0000 (11:24 +0100)]
Merge commit '2c328a907978b61949fd20f7c991803174337855'

* commit '2c328a907978b61949fd20f7c991803174337855':
  pixdesc: add a function for counting planes in a pixel format.
  avplay: remove the -debug option.
  Revert "asfenc: return error on negative timestamp"

Conflicts:
doc/APIchanges
doc/ffplay.texi
ffplay.c
libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agovc1dec: interlaced B-frames
Sebastian Sandberg [Thu, 31 Jan 2013 17:04:22 +0000 (18:04 +0100)]
vc1dec: interlaced B-frames

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoer: set error_occured on missing slices
Michael Niedermayer [Tue, 19 Feb 2013 18:58:52 +0000 (19:58 +0100)]
er: set error_occured on missing slices

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agofate: make metadata fate tests only output ts and metadata.
Clément Bœsch [Tue, 19 Mar 2013 22:09:36 +0000 (23:09 +0100)]
fate: make metadata fate tests only output ts and metadata.

The other information are just cluttering the output. The command line
is also simplified in the process.

6 years agolavc/utils: add VP6F hack for setting correct video size in stream
Stefano Sabatini [Mon, 18 Mar 2013 22:17:55 +0000 (23:17 +0100)]
lavc/utils: add VP6F hack for setting correct video size in stream

For some obscure reasons avcodec_set_dimensions() resets the width/height
so that the resulting value set in the stream is equal to the
corresponding coded_width/height, which is not the same as the correct
width/height in case of the H.264 and VP6F codecs.

This adds a codec-specific hack for VP6F which disables the call to
avcodec_set_dimensions() in avcodec_open2(), like it is done with H264. A
proper fix needs to be found yet.

Fix trac ticket #1386.

Based on a patch by Michael Niedermayer.

Trolled-By: Daemon404
See thread:
Subject: [FFmpeg-devel] [PATCH] ffprobe: Stash and use width and height before opening the codec
Date: Fri,  1 Mar 2013 10:41:34 -0500

6 years agolavd/dshow: fix style and typo recently introduced.
Clément Bœsch [Tue, 19 Mar 2013 20:25:49 +0000 (21:25 +0100)]
lavd/dshow: fix style and typo recently introduced.

6 years agolavfi: remove harddup libmpcodecs wrapper
Paul B Mahol [Tue, 19 Mar 2013 15:15:37 +0000 (15:15 +0000)]
lavfi: remove harddup libmpcodecs wrapper

It is supposed to be used with mencoder only and does
nothing when used with ffmpeg.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agochangelog: 10% faster aac encoding on x86 and MIPS
Compn [Tue, 19 Mar 2013 17:23:05 +0000 (13:23 -0400)]
changelog: 10% faster aac encoding on x86 and MIPS

6 years agoffprobe: set writer context to 0 after allocation
Stefano Sabatini [Tue, 19 Mar 2013 16:57:50 +0000 (17:57 +0100)]
ffprobe: set writer context to 0 after allocation

Avoid access to uninitialized values, which may result in a crash.

This happens for example in case of option parsing failure, since in that
case the internal AVBprint buffers are not initialized.

6 years agodoc/developer: fix typo in regression tests ref.
Clément Bœsch [Tue, 19 Mar 2013 16:45:53 +0000 (17:45 +0100)]
doc/developer: fix typo in regression tests ref.

6 years agofate: add missing filter dep in metadata tests.
Clément Bœsch [Tue, 19 Mar 2013 16:39:08 +0000 (17:39 +0100)]
fate: add missing filter dep in metadata tests.

6 years agodoc/ffmpeg,ffmpeg-formats: avoid to mention ffmpeg options from formats.texi
Stefano Sabatini [Mon, 18 Mar 2013 23:09:14 +0000 (00:09 +0100)]
doc/ffmpeg,ffmpeg-formats: avoid to mention ffmpeg options from formats.texi

Also extends documentation for timestamp related ffmpeg options, in order
to make more apparent the fact that muxer processing may change the
timestamps values.

6 years agodoc/ffmpeg-formats: reword and extend documentation for avoid_negative_ts option
Stefano Sabatini [Mon, 18 Mar 2013 22:55:19 +0000 (23:55 +0100)]
doc/ffmpeg-formats: reword and extend documentation for avoid_negative_ts option

Hopefully increase readability.

6 years agolavf/avformat.h: fix a few typos in AVFormatContext:avoid_negative_ts doxy
Stefano Sabatini [Mon, 18 Mar 2013 22:44:51 +0000 (23:44 +0100)]
lavf/avformat.h: fix a few typos in AVFormatContext:avoid_negative_ts doxy

6 years agomips: inline assembly clobber list polishing
Nedeljko Babic [Thu, 28 Feb 2013 14:57:09 +0000 (15:57 +0100)]
mips: inline assembly clobber list polishing

List of clobbered registers fixed and added where it is lacking.

Signed-off-by: Nedeljko Babic <nbabic@mips.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolmlm4: check packet_size against lower limit too
Michael Niedermayer [Tue, 19 Mar 2013 15:30:44 +0000 (16:30 +0100)]
lmlm4: check packet_size against lower limit too

Fixes CID732224

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc: update release_notes by taking the ones from release/1.2
Michael Niedermayer [Tue, 19 Mar 2013 15:15:31 +0000 (16:15 +0100)]
doc: update release_notes by taking the ones from release/1.2

6 years agofate: add curves filter test.
Clément Bœsch [Tue, 19 Mar 2013 14:24:15 +0000 (15:24 +0100)]
fate: add curves filter test.

6 years agovp56: Check av_frame_ref() return code
Michael Niedermayer [Tue, 19 Mar 2013 14:22:56 +0000 (15:22 +0100)]
vp56: Check av_frame_ref() return code

Fixes CID991837

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/tee: add forgotten ret assignment
Michael Niedermayer [Tue, 19 Mar 2013 14:09:10 +0000 (15:09 +0100)]
avformat/tee: add forgotten ret assignment

Fixes CID991840
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agohpeldsp: Increase put_no_rnd_pixels_tab[][] size
Michael Niedermayer [Tue, 19 Mar 2013 13:43:47 +0000 (14:43 +0100)]
hpeldsp: Increase put_no_rnd_pixels_tab[][] size

Fixes CID991852

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agofate: add ebur128 metadata test.
Clément Bœsch [Fri, 15 Mar 2013 01:52:30 +0000 (02:52 +0100)]
fate: add ebur128 metadata test.

6 years agoaudio_get_buffer: add assert to ensure nb_extended_buf has a safe value
Michael Niedermayer [Tue, 19 Mar 2013 13:19:29 +0000 (14:19 +0100)]
audio_get_buffer: add assert to ensure nb_extended_buf has a safe value

May silence CID991853

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomatroska_parse_frame: fix memleak
Michael Niedermayer [Tue, 19 Mar 2013 13:07:39 +0000 (14:07 +0100)]
matroska_parse_frame: fix memleak

Fixes CID991856
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavf: do not make a hard dep on internal subtitles helpers.
Clément Bœsch [Sat, 16 Mar 2013 23:27:00 +0000 (00:27 +0100)]
lavf: do not make a hard dep on internal subtitles helpers.

6 years agompegvideo_enc: remove stray semicolon
Michael Niedermayer [Tue, 19 Mar 2013 12:44:53 +0000 (13:44 +0100)]
mpegvideo_enc: remove stray semicolon

Fixes CID991857
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavutil/add_to_pool: remove unused assgnment
Michael Niedermayer [Tue, 19 Mar 2013 12:35:10 +0000 (13:35 +0100)]
avutil/add_to_pool: remove unused assgnment

Fixed CID991859
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoalac: Fix order of values in comment
chinshou [Tue, 19 Mar 2013 12:27:53 +0000 (13:27 +0100)]
alac: Fix order of values in comment

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavidec: fix duration and bitrate of truncated files
Michael Niedermayer [Tue, 19 Mar 2013 12:06:08 +0000 (13:06 +0100)]
avidec: fix duration and bitrate of truncated files

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agobuffersrc: fix a typo.
Anton Khirnov [Mon, 18 Mar 2013 06:22:58 +0000 (07:22 +0100)]
buffersrc: fix a typo.

Vertical shift is log2_chroma_h, not log2_chroma_w.

6 years agopixdesc: add a function for counting planes in a pixel format.
Anton Khirnov [Sat, 16 Mar 2013 18:37:52 +0000 (19:37 +0100)]
pixdesc: add a function for counting planes in a pixel format.

6 years agolavc, lavfi: fix counting number of planes in AVBufferRef wrappers
Anton Khirnov [Sat, 16 Mar 2013 21:36:56 +0000 (22:36 +0100)]
lavc, lavfi: fix counting number of planes in AVBufferRef wrappers

Number of planes is not always equal to the number of components even
for formats marked with PIX_FMT_PLANAR -- e.g. NV12 has three components
in two planes.

6 years agoavplay: remove the -debug option.
Anton Khirnov [Tue, 19 Mar 2013 06:55:25 +0000 (07:55 +0100)]
avplay: remove the -debug option.

It just shadows the corresponding AVOption and prevents using named
constants.

6 years agoRevert "asfenc: return error on negative timestamp"
Anton Khirnov [Tue, 19 Mar 2013 10:04:55 +0000 (11:04 +0100)]
Revert "asfenc: return error on negative timestamp"

This reverts commit d1bec33b46091546c5b2e6815210e73f87abf413, it breaks
FATE.

6 years agoffplay: silence warning of mixed enumeration types
Paul B Mahol [Tue, 19 Mar 2013 09:37:33 +0000 (09:37 +0000)]
ffplay: silence warning of mixed enumeration types

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agolavf/mxfdec: read field dominance flag
Matthieu Bouron [Sat, 16 Feb 2013 12:52:29 +0000 (13:52 +0100)]
lavf/mxfdec: read field dominance flag

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agopthread: update all get_buffer checks for get_buffer2
Hendrik Leppkes [Sun, 17 Mar 2013 09:59:39 +0000 (10:59 +0100)]
pthread: update all get_buffer checks for get_buffer2

This restores the performance of simple frame-threaded codecs back to
their pre-merge levels.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoFix Makefile dependency for the dvd_nav parser.
Carl Eugen Hoyos [Tue, 19 Mar 2013 01:11:39 +0000 (02:11 +0100)]
Fix Makefile dependency for the dvd_nav parser.

Fixes compilation for --disable-everything --enable-parser=dvd_nav

6 years agoInform the user if a pix_fmt != yuv420p was chosen for x264 encoding.
Carl Eugen Hoyos [Mon, 18 Mar 2013 23:43:01 +0000 (00:43 +0100)]
Inform the user if a pix_fmt != yuv420p was chosen for x264 encoding.

6 years agoAVFrame.pkt_dts: improve docs
Michael Niedermayer [Mon, 18 Mar 2013 23:47:00 +0000 (00:47 +0100)]
AVFrame.pkt_dts: improve docs

Related to Ticket2375

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agosegment: copy metadata
Michael Niedermayer [Mon, 18 Mar 2013 18:06:45 +0000 (19:06 +0100)]
segment: copy metadata

Fixes Ticket2230

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoFix termination of mov_ch_layouts_wav array lookup
Thierry Foucu [Mon, 18 Mar 2013 21:00:23 +0000 (14:00 -0700)]
Fix termination of mov_ch_layouts_wav array lookup

Problem found using ASAN.
In some case, the ff_mov_get_channel_layout_tag function will not find 0
as termination for lookup in the array mov_ch_layouts_wav.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc: Document the order in which avoid_negative_ts is applied compared to other times...
Michael Niedermayer [Mon, 18 Mar 2013 22:17:16 +0000 (23:17 +0100)]
doc: Document the order in which avoid_negative_ts is applied compared to other timestamp options

Also try to document the rational behind it.

This might fix Ticket2376

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc: try to improve avoid_negative_ts documentation
Michael Niedermayer [Mon, 18 Mar 2013 22:08:56 +0000 (23:08 +0100)]
doc: try to improve avoid_negative_ts documentation

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavc: fix avpacket memleak with subtitles recoding.
Clément Bœsch [Sun, 17 Mar 2013 01:30:10 +0000 (02:30 +0100)]
lavc: fix avpacket memleak with subtitles recoding.

6 years agolibavdevice sdl: added window_fullscreen option to switch SDL output into fullscreen...
dronus [Sun, 10 Mar 2013 15:29:04 +0000 (16:29 +0100)]
libavdevice sdl: added window_fullscreen option to switch SDL output into fullscreen mode

6 years agolibavcodec/proresdec.h: fix license header
Elvis Presley [Mon, 18 Mar 2013 18:34:41 +0000 (19:34 +0100)]
libavcodec/proresdec.h: fix license header

This was somehow missed when relicensing the decoder to LGPL

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavutil/buffer: Fix race in pool.
Michael Niedermayer [Sun, 17 Mar 2013 17:36:16 +0000 (18:36 +0100)]
avutil/buffer: Fix race in pool.

This race will always happen sooner or later in a multi-threaded
environment and it will over time lead to OOM.
This fix works by spinning, there are other ways by which this
can be fixed, like simply detecting the issue after it happened
and freeing the over-allocated memory or simply using a mutex.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoappend_packet_chunked: remove outcommented code
Michael Niedermayer [Mon, 18 Mar 2013 16:53:02 +0000 (17:53 +0100)]
append_packet_chunked: remove outcommented code

our variant works fine and should be better
also remove related unused variable

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agompeg2: 12LSB w/h of 0 is not allowed in compliant videos thus this also needs AV_EF_C...
Michael Niedermayer [Mon, 18 Mar 2013 16:48:52 +0000 (17:48 +0100)]
mpeg2: 12LSB w/h of 0 is not allowed in compliant videos thus this also needs AV_EF_COMPLIANT

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 18 Mar 2013 16:43:43 +0000 (17:43 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  print_options: do not generate docs for options without enc or dec flags
  mpeg12: do not fail on zero dimensions in the sequence header.

Conflicts:
libavcodec/mpeg12.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '50c449ac24fbb4c03c15d2e2026cef2204b80385'
Michael Niedermayer [Mon, 18 Mar 2013 16:30:53 +0000 (17:30 +0100)]
Merge commit '50c449ac24fbb4c03c15d2e2026cef2204b80385'

* commit '50c449ac24fbb4c03c15d2e2026cef2204b80385':
  iff: validate CMAP palette size
  asfenc: return error on negative timestamp

Conflicts:
libavformat/iff.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoprint_options: do not generate docs for options without enc or dec flags
Anton Khirnov [Fri, 22 Feb 2013 22:01:54 +0000 (23:01 +0100)]
print_options: do not generate docs for options without enc or dec flags

Those are not usable from the avtools, so mentioning them in the
manpages just confuses the reader.

6 years agompeg12: do not fail on zero dimensions in the sequence header.
Anton Khirnov [Sat, 16 Mar 2013 12:08:32 +0000 (13:08 +0100)]
mpeg12: do not fail on zero dimensions in the sequence header.

The total frame size is a combination of the 12 bits in the sequence
header and 2 more bits in the the sequence extension. While the
specification explicitly forbids the dimensions from the sequence header
from being 0 (thus ruling out multiples of 4096), such videos
apparrently exist in the wild so we should attempt to decode them.

Based on a patch by Michael Niedermayer <michaelni@gmx.at>

Fixes Bug 416.

6 years agoiff: validate CMAP palette size
Kostya Shishkov [Sun, 17 Mar 2013 19:22:19 +0000 (20:22 +0100)]
iff: validate CMAP palette size

Fixes CVE-2013-2495

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
CC: libav-stable@libav.org
6 years agoasfenc: return error on negative timestamp
Luca Barbato [Sun, 17 Mar 2013 14:13:43 +0000 (15:13 +0100)]
asfenc: return error on negative timestamp

According to the specification the timestamp is represented by a 32bit
unsigned.

CC: libav-stable@libav.org
6 years agolavc,lavu: fix two doxy mixup between h/v chroma shift.
Clément Bœsch [Mon, 18 Mar 2013 08:04:11 +0000 (09:04 +0100)]
lavc,lavu: fix two doxy mixup between h/v chroma shift.

6 years agolavfi/pad: fix horizontal/vertical shift confusion.
Clément Bœsch [Mon, 18 Mar 2013 07:51:55 +0000 (08:51 +0100)]
lavfi/pad: fix horizontal/vertical shift confusion.

6 years agoavutil/frame: typo
Michael Niedermayer [Mon, 18 Mar 2013 03:47:27 +0000 (04:47 +0100)]
avutil/frame: typo

found by ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavutil/frame: document alignment and padding requirements
Michael Niedermayer [Sun, 17 Mar 2013 02:20:16 +0000 (03:20 +0100)]
avutil/frame: document alignment and padding requirements

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi/ebur128: add metadata injection.
Clément Bœsch [Fri, 15 Mar 2013 01:52:12 +0000 (02:52 +0100)]
lavfi/ebur128: add metadata injection.

6 years agoaasc: fix pointer vs value error
Michael Niedermayer [Mon, 18 Mar 2013 01:10:10 +0000 (02:10 +0100)]
aasc: fix pointer vs value error

Fixes Ticket2365

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agobuffersrc: fix w/h error
Michael Niedermayer [Mon, 18 Mar 2013 01:00:57 +0000 (02:00 +0100)]
buffersrc: fix w/h error

Found-by: nevcairiel
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agormdec: flush audio packet on seeking
Michael Niedermayer [Sun, 17 Mar 2013 23:00:02 +0000 (00:00 +0100)]
rmdec: flush audio packet on seeking

Fixes Ticket1605

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/developer: Add "security fixes" to the release process steps
Michael Niedermayer [Sun, 17 Mar 2013 21:52:20 +0000 (22:52 +0100)]
doc/developer: Add "security fixes" to the release process steps

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'cigaes/master'
Michael Niedermayer [Sun, 17 Mar 2013 20:55:20 +0000 (21:55 +0100)]
Merge remote-tracking branch 'cigaes/master'

* cigaes/master:
  fate: add a test for -filter_complex / -lavfi without input.
  ffmpeg: make -lavfi an alias for -filter_complex.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavutil/get_pool: remove dead operations whichs result is never used.
Michael Niedermayer [Sun, 17 Mar 2013 15:51:40 +0000 (16:51 +0100)]
avutil/get_pool: remove dead operations whichs result is never used.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavutil/get_pool: Remove redundant initial atomic operation
Michael Niedermayer [Sun, 17 Mar 2013 15:37:06 +0000 (16:37 +0100)]
avutil/get_pool: Remove redundant initial atomic operation

602->442 dezicycles

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agofate: add a test for -filter_complex / -lavfi without input.
Nicolas George [Sun, 17 Mar 2013 12:32:57 +0000 (13:32 +0100)]
fate: add a test for -filter_complex / -lavfi without input.

6 years agoffmpeg: make -lavfi an alias for -filter_complex.
Nicolas George [Sat, 16 Mar 2013 16:08:33 +0000 (17:08 +0100)]
ffmpeg: make -lavfi an alias for -filter_complex.

6 years agompeg: Add passing DVD navigation packets (startcode 0x1bf) to caller to allow better...
Richard [Sun, 17 Mar 2013 09:21:12 +0000 (10:21 +0100)]
mpeg: Add passing DVD navigation packets (startcode 0x1bf) to caller to allow better playback handling of DVDs.

The two types of packets (PCI and DSI) are passed untouched but combined by the new codec ID AV_CODEC_ID_DVD_NAV.
 The first 980 bytes in the packet contain the PCI data. The next 1018 are the DSI data.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'cigaes/master'
Michael Niedermayer [Sun, 17 Mar 2013 13:30:26 +0000 (14:30 +0100)]
Merge remote-tracking branch 'cigaes/master'

* cigaes/master:
  lavfi/buffersink: fix header.
  lavfi/buffersrc: disable deprecated warnings.
  lavfi/buffersrc: check channel count changes.
  lavfi/buffersrc: set channel layout if it is known.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoh264_refs: fix typo in refs fallback check
Michael Niedermayer [Sun, 17 Mar 2013 13:15:15 +0000 (14:15 +0100)]
h264_refs: fix typo in refs fallback check

Fixes regression since 01a0283
Fixes Ticket2371

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi/swapuv: remove deprecated base field use
Stefano Sabatini [Sun, 17 Mar 2013 00:08:51 +0000 (01:08 +0100)]
lavfi/swapuv: remove deprecated base field use

6 years agoffplay: remove options skiploop, skipidct, skipframe
Stefano Sabatini [Sun, 17 Mar 2013 10:37:50 +0000 (11:37 +0100)]
ffplay: remove options skiploop, skipidct, skipframe

The corresponding codec options (skip_loop, skip_idct, skip_frame) can be
set in a more flexible way.

This technically causes a user interface break, but since the options
were not even documented and we just released a major version that should
not be a serious issue.

6 years agoffplay: remove unused variable "codec"
Stefano Sabatini [Sun, 17 Mar 2013 10:33:17 +0000 (11:33 +0100)]
ffplay: remove unused variable "codec"

Fix warning:
ffplay.c: In function ‘video_thread’:
ffplay.c:1890:21: warning: unused variable ‘codec’ [-Wunused-variable]

6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 17 Mar 2013 11:58:57 +0000 (12:58 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  lavc,lavfi: fix calculating the plane size in the AVBufferRef wrappers

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '23f4c5acc438366d84cacf49e33b0bcd72f04937'
Michael Niedermayer [Sun, 17 Mar 2013 11:32:07 +0000 (12:32 +0100)]
Merge commit '23f4c5acc438366d84cacf49e33b0bcd72f04937'

* commit '23f4c5acc438366d84cacf49e33b0bcd72f04937':
  document the release process

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi/buffersink: fix header.
Nicolas George [Sat, 16 Mar 2013 16:57:04 +0000 (17:57 +0100)]
lavfi/buffersink: fix header.

Move non-obsolete functions, structures and constants outside
the scope of "#if FF_API_AVFILTERBUFFER".

Add attribute_deprecated to av_buffersink_get_buffer_ref()
and av_buffersink_poll_frame().

Add doxygen for av_buffersink_get_frame_flags().

6 years agolavfi/buffersrc: disable deprecated warnings.
Nicolas George [Sat, 16 Mar 2013 16:46:55 +0000 (17:46 +0100)]
lavfi/buffersrc: disable deprecated warnings.

6 years agolavfi/buffersrc: check channel count changes.
Nicolas George [Sat, 16 Mar 2013 16:45:22 +0000 (17:45 +0100)]
lavfi/buffersrc: check channel count changes.

6 years agosndio_dec: add missing #include for av_gettime()
Paul B Mahol [Sun, 17 Mar 2013 11:10:26 +0000 (11:10 +0000)]
sndio_dec: add missing #include for av_gettime()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agolavfi/buffersrc: set channel layout if it is known.
Nicolas George [Thu, 14 Mar 2013 18:52:59 +0000 (19:52 +0100)]
lavfi/buffersrc: set channel layout if it is known.

Introduced in 01649c7, lost in the API change.

6 years agolavc,lavfi: fix calculating the plane size in the AVBufferRef wrappers
Anton Khirnov [Sat, 16 Mar 2013 17:09:17 +0000 (18:09 +0100)]
lavc,lavfi: fix calculating the plane size in the AVBufferRef wrappers

It is supposed to be height * linesize, not width * linesize.
Thanks to Hendrik Leppkes for pointing out the bug.

6 years agoMerge remote-tracking branch 'cus/stable'
Michael Niedermayer [Sun, 17 Mar 2013 04:24:35 +0000 (05:24 +0100)]
Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffplay: add -af option
  ffplay: use refcounted frames for audio
  ffplay: use frame->pts if available for setting the audio clock
  ffplay: restructure audio stream opening code

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoh264_qpel: fix another forgotten int stride
Michael Niedermayer [Sun, 17 Mar 2013 04:20:02 +0000 (05:20 +0100)]
h264_qpel: fix another forgotten int stride

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavc: remove unecessary a64enc include.
Clément Bœsch [Sun, 17 Mar 2013 02:44:14 +0000 (03:44 +0100)]
lavc: remove unecessary a64enc include.

6 years agoffplay: add -af option
Marton Balint [Mon, 25 Feb 2013 21:00:30 +0000 (22:00 +0100)]
ffplay: add -af option

Based on a patch by Stefano Sabatini <stefasab@gmail.com>:
http://ffmpeg.org/pipermail/ffmpeg-devel/2013-February/138452.html

Signed-off-by: Marton Balint <cus@passwd.hu>
6 years agoffplay: use refcounted frames for audio
Marton Balint [Wed, 13 Mar 2013 00:26:21 +0000 (01:26 +0100)]
ffplay: use refcounted frames for audio

Signed-off-by: Marton Balint <cus@passwd.hu>
6 years agoffplay: use frame->pts if available for setting the audio clock
Marton Balint [Sat, 2 Mar 2013 19:21:52 +0000 (20:21 +0100)]
ffplay: use frame->pts if available for setting the audio clock

Signed-off-by: Marton Balint <cus@passwd.hu>
6 years agoffplay: restructure audio stream opening code
Marton Balint [Sat, 2 Mar 2013 13:38:23 +0000 (14:38 +0100)]
ffplay: restructure audio stream opening code

Preparation for -af support.

Signed-off-by: Marton Balint <cus@passwd.hu>
6 years agolavfi/alphaextract: fix frame memleak.
Clément Bœsch [Sun, 17 Mar 2013 01:57:43 +0000 (02:57 +0100)]
lavfi/alphaextract: fix frame memleak.

6 years agoavutil/frame: fix video buffer allocation
Michael Niedermayer [Sun, 17 Mar 2013 01:18:08 +0000 (02:18 +0100)]
avutil/frame: fix video buffer allocation

The padding was lost during porting from avcodec
Should fix out of array accesses

Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agotests/filter-metadata-scenedetect: update reference
Stefano Sabatini [Sun, 17 Mar 2013 01:02:59 +0000 (02:02 +0100)]
tests/filter-metadata-scenedetect: update reference

Fix reference after f7ab23b0d0a8b72a62bd9386a1e48ccc2cf47576.
+10l to me, this time aliens are not involved.

6 years agotests/eval: fix reference after b2098d2417a085d33d99738dd7f963c7b260a0bf
Stefano Sabatini [Sun, 17 Mar 2013 00:56:53 +0000 (01:56 +0100)]
tests/eval: fix reference after b2098d2417a085d33d99738dd7f963c7b260a0bf

+10l to me, I blame the aliens.

6 years agolavfi/thumbnail: replace frame unref with free.
Clément Bœsch [Sun, 17 Mar 2013 00:46:22 +0000 (01:46 +0100)]
lavfi/thumbnail: replace frame unref with free.

Fixes memleak spotted by FATE.

6 years agoffprobe: remove deprecated frame "reference" field
Stefano Sabatini [Sat, 16 Mar 2013 00:22:45 +0000 (01:22 +0100)]
ffprobe: remove deprecated frame "reference" field

6 years agolavfi/settb: add support for named options
Stefano Sabatini [Fri, 15 Mar 2013 23:29:55 +0000 (00:29 +0100)]
lavfi/settb: add support for named options

6 years agolavfi/blackframe: add support for named options
Stefano Sabatini [Fri, 15 Mar 2013 23:07:15 +0000 (00:07 +0100)]
lavfi/blackframe: add support for named options