ffmpeg.git
7 years agolibvpxenc: add VP8E_SET_MAX_INTRA_BITRATE_PCT mapping
James Zern [Sat, 9 Jun 2012 21:40:51 +0000 (14:40 -0700)]
libvpxenc: add VP8E_SET_MAX_INTRA_BITRATE_PCT mapping

defines 'max-intra-rate' in line with vpxenc param

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavu/timestamp: remove duplicate definition of AV_TS_MAX_STRING_SIZE
Stefano Sabatini [Sat, 9 Jun 2012 22:00:33 +0000 (00:00 +0200)]
lavu/timestamp: remove duplicate definition of AV_TS_MAX_STRING_SIZE

7 years agolibopenjpeg: YUVA422P and YUVA444P support
Paul B Mahol [Sat, 9 Jun 2012 18:33:29 +0000 (18:33 +0000)]
libopenjpeg: YUVA422P and YUVA444P support

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 9 Jun 2012 18:30:17 +0000 (20:30 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  h264: allow cropping to AVCodecContext.width/height
  mov: set AVCodecContext.width/height for h264
  iac: generate codec tables as they are supposed to be
  indeo4: handle frame type 1 properly
  lavu: change versioning script to include all av* prefixed symbols

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffv1enc: add yuva422p to .pix_fmts
Paul B Mahol [Sat, 9 Jun 2012 18:15:50 +0000 (18:15 +0000)]
ffv1enc: add yuva422p to .pix_fmts

This was forgotten in 4e4634aa160ad0e27bee5e7809edbfcace08eba6.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoMerge remote-tracking branch 'cus/stable'
Michael Niedermayer [Sat, 9 Jun 2012 18:09:51 +0000 (20:09 +0200)]
Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffplay: fix return value of get_video_frame if avcodec_decode_video fails

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoremove unreferenced table "dnxhd_1238_ac_index_flag" (empty curly braces did not...
J. Bohl [Sat, 9 Jun 2012 15:45:41 +0000 (17:45 +0200)]
remove unreferenced table "dnxhd_1238_ac_index_flag" (empty curly braces did not compile with ICL12.1)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolibopenjpegdec: unbreak yuva420p support
Paul B Mahol [Sat, 9 Jun 2012 18:06:09 +0000 (18:06 +0000)]
libopenjpegdec: unbreak yuva420p support

Regression introduced in b7a928b2d1563575a8d9ec5aa606f735620b38ab.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoffplay: fix return value of get_video_frame if avcodec_decode_video fails
Marton Balint [Sat, 9 Jun 2012 17:44:58 +0000 (19:44 +0200)]
ffplay: fix return value of get_video_frame if avcodec_decode_video fails

Signed-off-by: Marton Balint <cus@passwd.hu>
7 years agocolorspace-test: add few more tests
Paul B Mahol [Sat, 9 Jun 2012 12:12:41 +0000 (12:12 +0000)]
colorspace-test: add few more tests

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agofloat_dsp.c: Restore author attribution that was removed by libav while moving code...
Michael Niedermayer [Fri, 8 Jun 2012 21:48:35 +0000 (23:48 +0200)]
float_dsp.c: Restore author attribution that was removed by libav while moving code to libavutil

Original code comes from:
commit eb4825b5d43bb6ecfae4d64688f9e2d2ac075263
Author: Loren Merritt <lorenm@u.washington.edu>
Date:   Thu Aug 10 19:06:25 2006 +0000

    sse and 3dnow implementations of float->int conversion and mdct windowing.
    15% faster vorbis.

and

commit 0bde73d907dbe684e01bafc979bf4a04ddeace1d
Author: Michael Niedermayer <michaelni@gmx.at>
Date:   Tue May 17 19:02:43 2005 +0000

    Vorbis decoder by (Balatoni Denes | dbalatoni programozo hu)

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agox86/float_dsp.asm: restore author attribution
Michael Niedermayer [Fri, 8 Jun 2012 21:35:35 +0000 (23:35 +0200)]
x86/float_dsp.asm: restore author attribution

The attribution was removed by libav while moving the code to libavutil

The original code is from
commit eb4825b5d43bb6ecfae4d64688f9e2d2ac075263
Author: Loren Merritt <lorenm@u.washington.edu>
Date:   Thu Aug 10 19:06:25 2006 +0000

    sse and 3dnow implementations of float->int conversion and mdct windowing.
    15% faster vorbis.

and

commit 069720565ce0f2cc94fa2474f30d155b2755e350
Author: Loren Merritt <lorenm@u.washington.edu>
Date:   Fri Aug 11 18:19:37 2006 +0000

    vorbis simd tweaks

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoh264: allow cropping to AVCodecContext.width/height
Mans Rullgard [Wed, 30 May 2012 03:04:54 +0000 (04:04 +0100)]
h264: allow cropping to AVCodecContext.width/height

Override the frame size from the SPS with AVCodecContext values
if the latter specify a size smaller by less than one macroblock.
This is required for correct cropping of MOV files from Canon cameras.

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agomov: set AVCodecContext.width/height for h264
Mans Rullgard [Wed, 30 May 2012 03:06:00 +0000 (04:06 +0100)]
mov: set AVCodecContext.width/height for h264

This is required for correct cropping of files from Canon
cameras.

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agolavc/bintext: check extradata size
Michael Niedermayer [Sat, 9 Jun 2012 13:03:04 +0000 (15:03 +0200)]
lavc/bintext: check extradata size

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavf/bintext: allocate FF_INPUT_BUFFER_PADDING_SIZE for extradata
Michael Niedermayer [Sat, 9 Jun 2012 12:36:41 +0000 (14:36 +0200)]
lavf/bintext: allocate FF_INPUT_BUFFER_PADDING_SIZE for extradata

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffmpeg: fix fate breakage introduced by key=value buffersrc args.
Michael Niedermayer [Sat, 9 Jun 2012 11:59:00 +0000 (13:59 +0200)]
ffmpeg: fix fate breakage introduced by key=value buffersrc args.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoswscale: unscaled rgb48 <-> bgr48
Paul B Mahol [Wed, 6 Jun 2012 16:31:13 +0000 (16:31 +0000)]
swscale: unscaled rgb48 <-> bgr48

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agobink: check av_mallocz() return value
Paul B Mahol [Sat, 9 Jun 2012 10:57:14 +0000 (10:57 +0000)]
bink: check av_mallocz() return value

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agobinkaudio: prevent extradata overread
Paul B Mahol [Sat, 9 Jun 2012 10:30:31 +0000 (10:30 +0000)]
binkaudio: prevent extradata overread

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoffmpeg: with filter_complex, avoid random in<->out mapping.
Nicolas George [Wed, 23 May 2012 11:53:42 +0000 (13:53 +0200)]
ffmpeg: with filter_complex, avoid random in<->out mapping.

With complex filters, an output can come from any input,
or several inputs, including inputs of a different type.
Copying the codec parameters from the first input with
the same type does not make any sense.

This does not change anything for simple 1->1 filters,
as source_index is set in that case.

7 years agoffmpeg: init icodec.
Nicolas George [Thu, 7 Jun 2012 18:49:24 +0000 (20:49 +0200)]
ffmpeg: init icodec.

With complex filter graphs, it can end up accessed
without having been set.

7 years agoffmpeg: use the frame rate computed by lavfi.
Nicolas George [Tue, 5 Jun 2012 10:43:33 +0000 (12:43 +0200)]
ffmpeg: use the frame rate computed by lavfi.

This frame rate is more reliable than the one copied
from the input stream, so it is used in priority.

7 years agoffmpeg: add frame rate to the buffersrc arguments.
Nicolas George [Tue, 5 Jun 2012 10:42:39 +0000 (12:42 +0200)]
ffmpeg: add frame rate to the buffersrc arguments.

The arguments now use the key=value syntax.

7 years agobuffersrc: deprecate flat options syntax.
Nicolas George [Thu, 7 Jun 2012 18:10:10 +0000 (20:10 +0200)]
buffersrc: deprecate flat options syntax.

7 years agobuffersrc: accept the frame rate as argument.
Nicolas George [Thu, 7 Jun 2012 18:10:36 +0000 (20:10 +0200)]
buffersrc: accept the frame rate as argument.

7 years agobuffersrc: accept key=value arguments.
Nicolas George [Tue, 5 Jun 2012 10:33:35 +0000 (12:33 +0200)]
buffersrc: accept key=value arguments.

The current flat arguments syntax is not easily extensible
due to sws_param possibly containing commas.
This is also consistent with abuffersrc.

7 years agobuffersink: add av_buffersink_get_frame_rate().
Nicolas George [Tue, 5 Jun 2012 10:40:37 +0000 (12:40 +0200)]
buffersink: add av_buffersink_get_frame_rate().

7 years agolavfi: add a frame_rate field to AVFilterLink.
Nicolas George [Tue, 5 Jun 2012 10:32:57 +0000 (12:32 +0200)]
lavfi: add a frame_rate field to AVFilterLink.

7 years agoiac: generate codec tables as they are supposed to be
Kostya Shishkov [Fri, 8 Jun 2012 17:34:46 +0000 (19:34 +0200)]
iac: generate codec tables as they are supposed to be

Unlike its predecessor, Indeo Audio codec generates tables depending on
sampling rate. Previously decoder used pre-generated tables for 22050 Hz
which obviously doesn't work with other frequencies.

Many thanks to Maxim Poliakovsky for providing all needed information
for this.

7 years agoindeo4: handle frame type 1 properly
Kostya Shishkov [Wed, 6 Jun 2012 18:13:07 +0000 (20:13 +0200)]
indeo4: handle frame type 1 properly

It turns out that this frame type is actually intra and should be used as
a reference for interframes too.

7 years agolibavutil.v: add avpriv prefix
Michael Niedermayer [Sat, 9 Jun 2012 00:50:30 +0000 (02:50 +0200)]
libavutil.v: add avpriv prefix

This should fix the fate failure
http://fate.ffmpeg.org/log.cgi?time=20120609002213&log=compile&slot=x86_64-archlinux-gcc-enableshared

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoswr: skip memset(0) in rematrix when the array is known to be already 0
Michael Niedermayer [Sat, 9 Jun 2012 00:06:58 +0000 (02:06 +0200)]
swr: skip memset(0) in rematrix when the array is known to be already 0

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoswr: zero buffers on allocation
Michael Niedermayer [Sat, 9 Jun 2012 00:41:33 +0000 (02:41 +0200)]
swr: zero buffers on allocation

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoadd bracket around the argument (fixes compilation error with ICL)
J. Bohl [Fri, 8 Jun 2012 21:05:08 +0000 (23:05 +0200)]
add bracket around the argument (fixes compilation error with ICL)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'cus/stable'
Michael Niedermayer [Fri, 8 Jun 2012 22:28:16 +0000 (00:28 +0200)]
Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffplay: reset AVFrame to defaults before decoding each new frame.
  ffplay: check return code of avcodec_decode_video2()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 8 Jun 2012 21:02:54 +0000 (23:02 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  float_dsp: ppc: add a separate header for Altivec function prototypes
  ARM: fix float_dsp breakage from d5a7229
  Add a float DSP framework to libavutil
  PPC: Move types_altivec.h and util_altivec.h from libavcodec to libavutil
  ARM: Move asm.S from libavcodec to libavutil
  vc1dsp: mark put/avg_vc1_mspel_mc() always_inline

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoswr: add mix8to2
Michael Niedermayer [Fri, 8 Jun 2012 20:12:00 +0000 (22:12 +0200)]
swr: add mix8to2

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoswr: 5.1->stereo double, float and s16
Michael Niedermayer [Fri, 8 Jun 2012 19:56:20 +0000 (21:56 +0200)]
swr: 5.1->stereo double, float and s16

2.5 times faster than the generic code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoswr: add all in one rematrixing function ptr
Michael Niedermayer [Fri, 8 Jun 2012 19:55:33 +0000 (21:55 +0200)]
swr: add all in one rematrixing function ptr

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoswr: add inrermediate sample type for rematrixing
Michael Niedermayer [Fri, 8 Jun 2012 19:54:54 +0000 (21:54 +0200)]
swr: add inrermediate sample type for rematrixing

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavu: change versioning script to include all av* prefixed symbols
Justin Ruggles [Fri, 8 Jun 2012 19:47:59 +0000 (15:47 -0400)]
lavu: change versioning script to include all av* prefixed symbols

Needed to properly export avpriv_* symbols.

7 years agoffplay: reset AVFrame to defaults before decoding each new frame.
Michael Niedermayer [Fri, 8 Jun 2012 12:41:24 +0000 (14:41 +0200)]
ffplay: reset AVFrame to defaults before decoding each new frame.

This fixes: ffplay -f lavfi -i cellauto
This was a regression since factorizing the filter code with ffmpeg.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Marton Balint <cus@passwd.hu>
7 years agoffplay: check return code of avcodec_decode_video2()
Michael Niedermayer [Fri, 8 Jun 2012 12:41:23 +0000 (14:41 +0200)]
ffplay: check return code of avcodec_decode_video2()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Marton Balint <cus@passwd.hu>
7 years agofloat_dsp: ppc: add a separate header for Altivec function prototypes
Justin Ruggles [Fri, 8 Jun 2012 17:58:03 +0000 (13:58 -0400)]
float_dsp: ppc: add a separate header for Altivec function prototypes

Also include config.h so that HAVE_ALTIVEC will be defined.
Fixes compilation on PPC with Altivec enabled.

7 years agoARM: fix float_dsp breakage from d5a7229
Mans Rullgard [Fri, 8 Jun 2012 18:24:51 +0000 (19:24 +0100)]
ARM: fix float_dsp breakage from d5a7229

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agoAdd a float DSP framework to libavutil
Justin Ruggles [Mon, 21 May 2012 16:58:41 +0000 (12:58 -0400)]
Add a float DSP framework to libavutil

Move vector_fmul() from DSPContext to AVFloatDSPContext.

7 years agoPPC: Move types_altivec.h and util_altivec.h from libavcodec to libavutil
Justin Ruggles [Mon, 21 May 2012 20:24:42 +0000 (16:24 -0400)]
PPC: Move types_altivec.h and util_altivec.h from libavcodec to libavutil

This will allow for easier implementation of Altivec functions in libraries
other than libavcodec.

7 years agoARM: Move asm.S from libavcodec to libavutil
Justin Ruggles [Mon, 21 May 2012 19:46:23 +0000 (15:46 -0400)]
ARM: Move asm.S from libavcodec to libavutil

This will allow for easier implementation of ARM-optimized functions in
libraries other than libavcodec.

7 years agorv10: change assert() to av_assert()
Michael Niedermayer [Fri, 8 Jun 2012 16:24:47 +0000 (18:24 +0200)]
rv10: change assert() to av_assert()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffmpeg.c: fix erroneous "Output file is empty" message.
Mike Scheutzow [Fri, 8 Jun 2012 14:24:09 +0000 (10:24 -0400)]
ffmpeg.c: fix erroneous "Output file is empty" message.

This message is printed whenever the RAWVIDEO codec is used, whether the
output file contains any frames or not. Test command:
./ffmpeg -i infile.y4m outfile.y4m

Signed-off-by: Mike Scheutzow <mjs973@optonline.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoRevert "Fix building libopencore_amrnb decoder without libopencore_amrnb encoder"
Paul B Mahol [Fri, 8 Jun 2012 13:52:21 +0000 (13:52 +0000)]
Revert "Fix building libopencore_amrnb decoder without libopencore_amrnb encoder"

Reverting "Fix" because it disables amrwb decoder.

This reverts commit e11020a1459de122834055be93a70566ce064bcc.

7 years agoAdd iac build dependency.
Carl Eugen Hoyos [Fri, 8 Jun 2012 13:21:49 +0000 (15:21 +0200)]
Add iac build dependency.

Found and analysed by trac user Jamal.

Fixes the remaining part of ticket #1428.

7 years agoFix dirac decoder build dependencies.
Carl Eugen Hoyos [Fri, 8 Jun 2012 13:07:09 +0000 (15:07 +0200)]
Fix dirac decoder build dependencies.

Found, analysed and tested by trac user Jamal.

Fixes part of ticket #1428.

7 years agoFix latm muxer Makefile dependencies.
Carl Eugen Hoyos [Fri, 8 Jun 2012 13:03:52 +0000 (15:03 +0200)]
Fix latm muxer Makefile dependencies.

Found, analysed and tested by trac user Jamal.

Fixes part of ticket #1428.

7 years agoFix jacosub muxer Makefile dependencies.
Carl Eugen Hoyos [Fri, 8 Jun 2012 13:02:46 +0000 (15:02 +0200)]
Fix jacosub muxer Makefile dependencies.

Found, analysed and tested by trac user Jamal.

Fixes part of ticket #1428.

7 years agoFix amv encoder dependencies.
Carl Eugen Hoyos [Fri, 8 Jun 2012 12:57:20 +0000 (14:57 +0200)]
Fix amv encoder dependencies.

Found, analysed and tested by trac user Jamal.

Fixes part of ticket #1428.

7 years agoFix building libopencore_amrnb decoder without libopencore_amrnb encoder
Paul B Mahol [Fri, 8 Jun 2012 12:58:35 +0000 (12:58 +0000)]
Fix building libopencore_amrnb decoder without libopencore_amrnb encoder

Fixes #1210.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agopixdesc: BGRA64 is rgb pixel format
Paul B Mahol [Wed, 6 Jun 2012 13:56:46 +0000 (13:56 +0000)]
pixdesc: BGRA64 is rgb pixel format

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agofate-bprint: try to workaround platform specific value.
Michael Niedermayer [Fri, 8 Jun 2012 10:14:36 +0000 (12:14 +0200)]
fate-bprint: try to workaround platform specific value.

this should fix some fate failures

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoRevert "sinewin_tablegen: use av_assert"
Michael Niedermayer [Fri, 8 Jun 2012 09:44:50 +0000 (11:44 +0200)]
Revert "sinewin_tablegen: use av_assert"

using as_assert() in the table generator would make the generators
have to be linked to libavutil.

This reverts commit c3b6efa4cb25400d7ff8853ee6ebd95c29b744a6.

7 years agovc1dsp: mark put/avg_vc1_mspel_mc() always_inline
Mans Rullgard [Thu, 7 Jun 2012 13:20:44 +0000 (14:20 +0100)]
vc1dsp: mark put/avg_vc1_mspel_mc() always_inline

This ensures that these functions are inlined into the per-position
entry points, allowing constant propagation as needed for proper
optimisation.

18% faster VC1 decoding on Cortex-A9.

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agompegtsenc: make pts/dts offseting optional
Michael Niedermayer [Fri, 8 Jun 2012 01:30:47 +0000 (03:30 +0200)]
mpegtsenc: make pts/dts offseting optional

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agocmdutils: include threading caps in codecs listing.
Nicolas George [Wed, 30 May 2012 19:32:32 +0000 (21:32 +0200)]
cmdutils: include threading caps in codecs listing.

Suggested by Roger Pack on ffmpeg-user.

7 years agoamerge: accept multiple inputs.
Nicolas George [Sun, 3 Jun 2012 19:32:22 +0000 (21:32 +0200)]
amerge: accept multiple inputs.

7 years agoaf_amerge: move nb_in_ch into the in structure.
Nicolas George [Thu, 31 May 2012 21:55:33 +0000 (23:55 +0200)]
af_amerge: move nb_in_ch into the in structure.

With that change, there is only one array for the inputs,
it will make easier to implement a variable number of inputs.

7 years agoaudioconvert: implement av_bprint_channel_layout().
Nicolas George [Sun, 3 Jun 2012 19:09:16 +0000 (21:09 +0200)]
audioconvert: implement av_bprint_channel_layout().

And reimplement av_get_channel_layout_string() on top of it.

7 years agofate: add bprint test.
Nicolas George [Sun, 3 Jun 2012 17:00:22 +0000 (19:00 +0200)]
fate: add bprint test.

7 years agobprint: add av_bprint_init_for_buffer().
Nicolas George [Sun, 3 Jun 2012 17:48:33 +0000 (19:48 +0200)]
bprint: add av_bprint_init_for_buffer().

7 years agoopt: add test for IMAGE_SIZE and PIXEL_FMT.
Nicolas George [Tue, 5 Jun 2012 12:40:43 +0000 (14:40 +0200)]
opt: add test for IMAGE_SIZE and PIXEL_FMT.

7 years agoopt: free test_ctx.string at the end.
Nicolas George [Tue, 5 Jun 2012 12:32:51 +0000 (14:32 +0200)]
opt: free test_ctx.string at the end.

Makes valgrind happy.

7 years agoopt: init test_ctx to 0.
Nicolas George [Tue, 5 Jun 2012 12:31:29 +0000 (14:31 +0200)]
opt: init test_ctx to 0.

Otherwise, setting string will try to free a random address.

7 years agoopt: add AV_OPT_TYPE_PIXEL_FMT.
Nicolas George [Tue, 5 Jun 2012 10:32:19 +0000 (12:32 +0200)]
opt: add AV_OPT_TYPE_PIXEL_FMT.

7 years agoMerge remote-tracking branch 'cus/stable'
Michael Niedermayer [Thu, 7 Jun 2012 19:55:30 +0000 (21:55 +0200)]
Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffplay: fix build if avfilter is disabled
  ffplay: fix frame_delay calculation in new avfilter code
  ffplay: add support for changing pixel format
  ffplay: add missing filt_in assignment after video filter reconfigure
  ffplay: fix frame aspect ratio after qatar merge
  ffplay: fix use after free
  ffplay: use dummy video driver if display is disabled

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 7 Jun 2012 19:45:52 +0000 (21:45 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  mpegts: Remove disabled extension matching probe.
  fate: avoid freopen(NULL) in videogen/rotozoom

Conflicts:
tests/rotozoom.c
tests/videogen.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoh261enc: use av_assert
Michael Niedermayer [Thu, 7 Jun 2012 19:32:32 +0000 (21:32 +0200)]
h261enc: use av_assert

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoh261dec: use av_assert
Michael Niedermayer [Thu, 7 Jun 2012 19:31:22 +0000 (21:31 +0200)]
h261dec: use av_assert

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoswfenc: use av_assert
Michael Niedermayer [Thu, 7 Jun 2012 19:30:07 +0000 (21:30 +0200)]
swfenc: use av_assert

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agompegts: Remove disabled extension matching probe.
Alex Converse [Tue, 5 Jun 2012 18:16:06 +0000 (11:16 -0700)]
mpegts: Remove disabled extension matching probe.

7 years agoxmv: use av_assert
Michael Niedermayer [Thu, 7 Jun 2012 19:09:06 +0000 (21:09 +0200)]
xmv: use av_assert

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoh264_mvpred: use av_assert
Michael Niedermayer [Thu, 7 Jun 2012 19:07:17 +0000 (21:07 +0200)]
h264_mvpred: use av_assert

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavc/rectangle: change assert to av_assert
Michael Niedermayer [Thu, 7 Jun 2012 18:51:07 +0000 (20:51 +0200)]
lavc/rectangle: change assert to av_assert

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavf: fix missing "parser not found" message
Michael Niedermayer [Thu, 7 Jun 2012 17:02:32 +0000 (19:02 +0200)]
lavf: fix missing "parser not found" message

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoyuv2rgb: remove assert() the codepath is not invalid
Michael Niedermayer [Thu, 7 Jun 2012 15:45:16 +0000 (17:45 +0200)]
yuv2rgb: remove assert() the codepath is not invalid

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agosvq1enc: use av_assert
Michael Niedermayer [Thu, 7 Jun 2012 15:41:12 +0000 (17:41 +0200)]
svq1enc: use av_assert

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffmpeg: move keyboard interaction in a function.
Nicolas George [Wed, 6 Jun 2012 13:56:34 +0000 (15:56 +0200)]
ffmpeg: move keyboard interaction in a function.

It makes the transcode loop easier to read (30% less code)
and the differences with avconv easier to spot.

7 years agolavfi/audio: fix size of copied samples.
Nicolas George [Wed, 6 Jun 2012 11:25:34 +0000 (13:25 +0200)]
lavfi/audio: fix size of copied samples.

Fixes sporadic segfaults with some filters.

7 years agofate: avoid freopen(NULL) in videogen/rotozoom
Mans Rullgard [Wed, 6 Jun 2012 16:12:29 +0000 (17:12 +0100)]
fate: avoid freopen(NULL) in videogen/rotozoom

A number of systems do not implement freopen() with a NULL filename
correctly.  This changes these programs to output individual images
if opening a named output argument as a file fails, in this case
assuming it is a directory.

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agoffplay: fix build if avfilter is disabled
Marton Balint [Wed, 6 Jun 2012 21:16:29 +0000 (23:16 +0200)]
ffplay: fix build if avfilter is disabled

Signed-off-by: Marton Balint <cus@passwd.hu>
7 years agoffplay: fix frame_delay calculation in new avfilter code
Marton Balint [Wed, 6 Jun 2012 21:06:23 +0000 (23:06 +0200)]
ffplay: fix frame_delay calculation in new avfilter code

Signed-off-by: Marton Balint <cus@passwd.hu>
7 years agoffplay: add support for changing pixel format
Marton Balint [Wed, 6 Jun 2012 20:32:25 +0000 (22:32 +0200)]
ffplay: add support for changing pixel format

With the filtering code refactored, it was much easier to finally fix this.

Fixes ticket 123 and 238.

Signed-off-by: Marton Balint <cus@passwd.hu>
7 years agoffplay: add missing filt_in assignment after video filter reconfigure
Marton Balint [Wed, 6 Jun 2012 20:20:23 +0000 (22:20 +0200)]
ffplay: add missing filt_in assignment after video filter reconfigure

Fixes segfaults on changing resolution.

Signed-off-by: Marton Balint <cus@passwd.hu>
7 years agoffplay: fix frame aspect ratio after qatar merge
Marton Balint [Wed, 6 Jun 2012 20:09:41 +0000 (22:09 +0200)]
ffplay: fix frame aspect ratio after qatar merge

Signed-off-by: Marton Balint <cus@passwd.hu>
7 years agoffplay: fix use after free
Michael Niedermayer [Wed, 6 Jun 2012 21:17:29 +0000 (23:17 +0200)]
ffplay: fix use after free

reproduceable with:
ffmpeg -i tests/lena.pnm -pix_fmt pal8 -vcodec rawvideo -s 512x512 out.avi
valgrind ffplay_g out.avi

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Marton Balint <cus@passwd.hu>
7 years agoffplay: use dummy video driver if display is disabled
Marton Balint [Sun, 3 Jun 2012 17:36:06 +0000 (19:36 +0200)]
ffplay: use dummy video driver if display is disabled

Fixes ticket 1402.

Signed-off-by: Marton Balint <cus@passwd.hu>
7 years agoffprobe: show packet duration in frame
Stefano Sabatini [Thu, 8 Mar 2012 14:26:57 +0000 (15:26 +0100)]
ffprobe: show packet duration in frame

7 years agoffprobe: honour special value for duration
Stefano Sabatini [Tue, 5 Jun 2012 17:15:58 +0000 (19:15 +0200)]
ffprobe: honour special value for duration

A duration value is undefined when is 0, take into consideration this
fact when printing optional fields.

7 years agolavfi: remove avfilter_default_item_name() from public API
Stefano Sabatini [Tue, 5 Jun 2012 16:58:51 +0000 (18:58 +0200)]
lavfi: remove avfilter_default_item_name() from public API

The function was introduced in 4d6a8a2bdb19 and is not used anymore
outside avfilter.c.

This avoids to pollute the public API with an apparently unnecessary
function. The function was introduced a few days ago, so removing it from
the public API should do no much harm.

7 years agolavfi/ocv: fix compilation after internalization of public functions
Stefano Sabatini [Wed, 6 Jun 2012 21:14:36 +0000 (23:14 +0200)]
lavfi/ocv: fix compilation after internalization of public functions

Include missing required internal headers.

7 years agotools/graph2dot: factorize code printing non-media specific link information
Stefano Sabatini [Wed, 6 Jun 2012 21:18:46 +0000 (23:18 +0200)]
tools/graph2dot: factorize code printing non-media specific link information