]>
git.sesse.net Git - ffmpeg/log
Michael Niedermayer [Wed, 5 Sep 2012 12:52:52 +0000 (14:52 +0200)]
Merge commit '
21bc44038491e525335ad763883b0288402ff6a0 '
* commit '
21bc44038491e525335ad763883b0288402ff6a0 ':
avopt: Explicitly store rational option defaults in .dbl
Conflicts:
libavfilter/buffersrc.c
libavfilter/vsrc_testsrc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 5 Sep 2012 12:44:05 +0000 (14:44 +0200)]
Merge commit '
c7b610aa0b1bac47eea0056b13fe6e982b85844a '
* commit '
c7b610aa0b1bac47eea0056b13fe6e982b85844a ':
avopt: Explicitly store float/double option defaults in .dbl
Conflicts:
libavcodec/ac3dec.c
libavcodec/libx264.c
libavfilter/af_amix.c
libavfilter/af_asyncts.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 5 Sep 2012 12:26:01 +0000 (14:26 +0200)]
Merge commit '
e6153f173a49e5bfa70b0c04d2f82930533597b9 '
* commit '
e6153f173a49e5bfa70b0c04d2f82930533597b9 ':
avopt: Store defaults for AV_OPT_TYPE_INT in the i64 union member
Conflicts:
libavcodec/libopenjpegdec.c
libavcodec/libopenjpegenc.c
libavcodec/libx264.c
libavcodec/mpeg12enc.c
libavcodec/options_table.h
libavcodec/snowenc.c
libavcodec/tiffenc.c
libavdevice/v4l2.c
libavdevice/x11grab.c
libavfilter/af_amix.c
libavfilter/af_asyncts.c
libavfilter/af_join.c
libavfilter/buffersrc.c
libavfilter/src_movie.c
libavfilter/vf_delogo.c
libavfilter/vf_drawtext.c
libavformat/http.c
libavformat/img2dec.c
libavformat/img2enc.c
libavformat/movenc.c
libavformat/mpegenc.c
libavformat/mpegtsenc.c
libavformat/options_table.h
libavformat/segment.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 5 Sep 2012 12:09:09 +0000 (14:09 +0200)]
Merge commit '
d58dd4b5b5d31cfd4092e38a5f2c894eee2ab078 '
* commit '
d58dd4b5b5d31cfd4092e38a5f2c894eee2ab078 ':
avopt: Store defaults for AV_OPT_TYPE_FLAGS in the i64 union member
Conflicts:
libavcodec/libvpxenc.c
libavcodec/options_table.h
libavfilter/vf_drawtext.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 5 Sep 2012 11:58:11 +0000 (13:58 +0200)]
Merge commit '
124134e42455763b28cc346fed1d07017a76e84e '
* commit '
124134e42455763b28cc346fed1d07017a76e84e ':
avopt: Store defaults for AV_OPT_TYPE_CONST in the i64 union member
Conflicts:
libavcodec/aacenc.c
libavcodec/libopenjpegenc.c
libavcodec/options_table.h
libavdevice/bktr.c
libavdevice/v4l2.c
libavdevice/x11grab.c
libavfilter/af_amix.c
libavfilter/vf_drawtext.c
libavformat/movenc.c
libavformat/options_table.h
libavutil/opt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 5 Sep 2012 11:49:48 +0000 (13:49 +0200)]
Merge commit '
2d7d91f06d6a1d243dc74c96d3389ee237a3b906 '
* commit '
2d7d91f06d6a1d243dc74c96d3389ee237a3b906 ':
svq1enc: Set picture_structure correctly
mpegvideo: remove last_picture_ptr / h264 assert.
mpegvideo_enc: remove assert that has become obsolete with the new API
elbg: Fix an assert
Conflicts:
libavcodec/elbg.c
libavcodec/mpegvideo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Wed, 5 Sep 2012 09:55:16 +0000 (11:55 +0200)]
doc/filters: add mp=noise example
Stefano Sabatini [Wed, 5 Sep 2012 09:53:25 +0000 (11:53 +0200)]
doc/filters: itemize example for mp filter
Stefano Sabatini [Wed, 5 Sep 2012 09:44:01 +0000 (11:44 +0200)]
doc/filters: remove reference to mp=hue filter, which was dropped
Clément Bœsch [Tue, 4 Sep 2012 15:49:15 +0000 (17:49 +0200)]
lavc/dvdsubdec: parse the size from the extradata.
Martin Storsjö [Thu, 30 Aug 2012 21:42:30 +0000 (00:42 +0300)]
avopt: Explicitly store rational option defaults in .dbl
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Fri, 31 Aug 2012 10:34:23 +0000 (13:34 +0300)]
avopt: Explicitly store float/double option defaults in .dbl
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Fri, 31 Aug 2012 10:22:31 +0000 (13:22 +0300)]
avopt: Store defaults for AV_OPT_TYPE_INT in the i64 union member
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Fri, 31 Aug 2012 09:52:18 +0000 (12:52 +0300)]
avopt: Store defaults for AV_OPT_TYPE_FLAGS in the i64 union member
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Fri, 31 Aug 2012 09:45:52 +0000 (12:45 +0300)]
avopt: Store defaults for AV_OPT_TYPE_CONST in the i64 union member
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Tue, 4 Sep 2012 19:26:16 +0000 (21:26 +0200)]
intreadwrite: Dont evaluate value for AV_W* multiple times.
Evaluating it multiple times, can have side effects and is possibly slow.
So its definitly a bad idea.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 4 Sep 2012 19:25:39 +0000 (21:25 +0200)]
paf: avoid using expressions with sideeffects in AV_R*
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 4 Sep 2012 16:49:58 +0000 (18:49 +0200)]
configure: update sinks used by ffplay/ffmpeg
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 4 Sep 2012 16:49:28 +0000 (18:49 +0200)]
libavfilter/Makefile: add forgotten entries for the ff-sinks
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 4 Sep 2012 16:49:05 +0000 (18:49 +0200)]
sink_buffer: fix #ifs for FF-sinks
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 6 Aug 2012 14:28:13 +0000 (16:28 +0200)]
svq1enc: Set picture_structure correctly
This fixes assert failures when running in debug mode.
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Mon, 6 Aug 2012 14:49:49 +0000 (16:49 +0200)]
mpegvideo: remove last_picture_ptr / h264 assert.
This assert is no longer true since h264 error concealment needs
last_picture_ptr to be set.
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Mon, 6 Aug 2012 08:26:04 +0000 (10:26 +0200)]
mpegvideo_enc: remove assert that has become obsolete with the new API
It now just checks uninitialized and unused data.
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Sat, 18 Aug 2012 19:53:32 +0000 (21:53 +0200)]
elbg: Fix an assert
It seems the condition was flipped from what was intended.
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Tue, 4 Sep 2012 15:04:51 +0000 (17:04 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
configure: add support for bdver1 and bdver2 CPU types.
avio: make avio_close NULL the freed buffer
pixdesc: cosmetics
proresenc: Don't free a buffer not owned by the codec
proresenc: Write the full value in one put_bits call
adpcmenc: Calculate the IMA_QT predictor without overflow
x86: Add convenience macros to check for CPU extensions and flags
x86: h264dsp: drop some unnecessary ifdefs around prototype declarations
mss12: merge decode_pixel() and decode_top_left_pixel()
mss12: reduce SliceContext size from 1067 to 164 KB
mss12: move SliceContexts out of the common context into the codec contexts
Conflicts:
libavformat/aviobuf.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diego Elio Pettenò [Mon, 3 Sep 2012 12:20:44 +0000 (05:20 -0700)]
configure: add support for bdver1 and bdver2 CPU types.
Signed-off-by: Diego Elio Pettenò <flameeyes@flameeyes.eu>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Luca Barbato [Tue, 4 Sep 2012 13:04:46 +0000 (15:04 +0200)]
avio: make avio_close NULL the freed buffer
Luca Barbato [Fri, 31 Aug 2012 09:22:20 +0000 (11:22 +0200)]
pixdesc: cosmetics
Martin Storsjö [Tue, 4 Sep 2012 11:57:45 +0000 (14:57 +0300)]
proresenc: Don't free a buffer not owned by the codec
The data in coded_frame isn't allocated using get_buffer, but
is copied from the input frame to the encoder, so we should
not try to free it ourselves.
This fixes an assert failure when running in debug mode.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Tue, 4 Sep 2012 11:31:52 +0000 (14:31 +0300)]
proresenc: Write the full value in one put_bits call
Previously, the put_bits call writing the value wrote a value
larger than the number of bits specified, failing asserts
in debug mode. There was no actual bitstream writer corruption,
since the overwritten bit already always was set to 1.
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Tue, 4 Sep 2012 11:02:30 +0000 (14:02 +0300)]
adpcmenc: Calculate the IMA_QT predictor without overflow
Previously, the value given to put_bits was 10 bits long for positive
predictors, even though 9 bits were to be written. The extra bit could
in some cases overwrite existing bits in the bitstream writer cache.
This fixes a failed assert in put_bits.h, when running a version
built with -DDEBUG.
The fate test result gets slightly improved, thanks to getting rid
of the overwritten bits in the bitstream writer cache.
Signed-off-by: Martin Storsjö <martin@martin.st>
Stefano Sabatini [Sat, 1 Sep 2012 09:14:27 +0000 (11:14 +0200)]
lavfi/transpose: implement landscape passthrough mode
Emulate the mp=rotate passthrough mode.
Stefano Sabatini [Thu, 30 Aug 2012 20:37:44 +0000 (22:37 +0200)]
examples/scaling_video: write to rawvideo file
This is more useful for testing purposes. Also allow to specify the name
of the output file.
Stefano Sabatini [Sat, 1 Sep 2012 15:59:20 +0000 (17:59 +0200)]
lavf/segment: add EXT-X-MEDIA-SEQUENCE tag in M3U8 header
Stefano Sabatini [Thu, 16 Aug 2012 16:13:17 +0000 (18:13 +0200)]
lavf/segment: deprecate "ext" format in favor of "csv"
The new option name is more descriptive.
Stefano Sabatini [Sat, 1 Sep 2012 14:12:29 +0000 (16:12 +0200)]
lavf/segment: add escaping for filename field of the CSV list file
CSV escaping code is borrowed from ffprobe.c.
Peter Ross [Mon, 3 Sep 2012 23:44:37 +0000 (09:44 +1000)]
tty: return av_get_packet() error codes instead of converting them to EIO
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Peter Ross [Sun, 2 Sep 2012 07:37:11 +0000 (17:37 +1000)]
tty: return EOF when the 'effective' end of file is reached. ('effective' because ansi/tty files may be concatenated with SAUCE/EFI metadata)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 4 Sep 2012 02:38:28 +0000 (04:38 +0200)]
aaccoder: switch to av_assert
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 4 Sep 2012 01:29:00 +0000 (03:29 +0200)]
h263dec: fix xvid IDCT switching
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Wed, 29 Aug 2012 16:53:14 +0000 (18:53 +0200)]
x86: Add convenience macros to check for CPU extensions and flags
Diego Biurrun [Sun, 2 Sep 2012 15:03:41 +0000 (17:03 +0200)]
x86: h264dsp: drop some unnecessary ifdefs around prototype declarations
Michael Niedermayer [Mon, 3 Sep 2012 21:39:50 +0000 (23:39 +0200)]
jpegdec: try to fix different flipping behavior of inteljpegs.
This may need some trial and error to find exactly how to identify them
so please report any intel jpegs that get fliped wrong.
Fixes Ticket511
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 3 Sep 2012 21:26:14 +0000 (23:26 +0200)]
lsp: change assert to av_assert
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 3 Sep 2012 20:46:19 +0000 (22:46 +0200)]
lavc: put motion test back.
While not that usefull, we can as well keep it until it breaks.
When it breaks for whatever reason ill likely remove it
Sorry for the revert spam, i had not realized this code compiles
and works fine.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 3 Sep 2012 20:40:41 +0000 (22:40 +0200)]
rmdec: remove unused variable
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 3 Sep 2012 20:40:31 +0000 (22:40 +0200)]
yadif: remove unused variable
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 3 Sep 2012 15:41:17 +0000 (17:41 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
build: avcodec: order cosmetics
intrax8dsp: Add missing #include to make header standalone
Delete motion-test tool; it is of doubtful utility.
Conflicts:
libavcodec/Makefile
libavcodec/motion-test.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Alberto Delmás [Fri, 31 Aug 2012 09:24:26 +0000 (11:24 +0200)]
mss12: merge decode_pixel() and decode_top_left_pixel()
No meaningful generated code differences using gcc -O3.
Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
Alberto Delmás [Sun, 2 Sep 2012 10:44:21 +0000 (12:44 +0200)]
mss12: reduce SliceContext size from 1067 to 164 KB
Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
Alberto Delmás [Sun, 2 Sep 2012 10:42:01 +0000 (12:42 +0200)]
mss12: move SliceContexts out of the common context into the codec contexts
Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
Diego Biurrun [Mon, 13 Aug 2012 23:57:22 +0000 (01:57 +0200)]
build: avcodec: order cosmetics
Diego Biurrun [Mon, 3 Sep 2012 09:21:19 +0000 (11:21 +0200)]
intrax8dsp: Add missing #include to make header standalone
Diego Biurrun [Tue, 28 Aug 2012 21:15:39 +0000 (23:15 +0200)]
Delete motion-test tool; it is of doubtful utility.
Michael Niedermayer [Sun, 2 Sep 2012 23:26:57 +0000 (01:26 +0200)]
snowdec: remove unused variable
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 2 Sep 2012 23:24:15 +0000 (01:24 +0200)]
ffv1: fix 2 uninitialized variable warnings
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Hans-Kristian Arntzen [Sun, 2 Sep 2012 19:52:40 +0000 (21:52 +0200)]
Remove redundant masks in STORE_BGR24_MMX.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 2 Sep 2012 19:00:15 +0000 (21:00 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
intrax8: move functions from dsputil to own context
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Peter Ross [Sun, 2 Sep 2012 02:27:19 +0000 (12:27 +1000)]
fate: add ansi256 test case
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Mans Rullgard [Sat, 25 Aug 2012 13:35:52 +0000 (14:35 +0100)]
intrax8: move functions from dsputil to own context
Signed-off-by: Mans Rullgard <mans@mansr.com>
Stefano Sabatini [Wed, 29 Aug 2012 21:41:30 +0000 (23:41 +0200)]
examples: add demuxing.c example
Stefano Sabatini [Sat, 1 Sep 2012 15:13:26 +0000 (17:13 +0200)]
lavf/segment: set EXT-X-VERSION to 3 rather than to 4
There is nothing we use of the latest version, downgrade version number
to increase decoding support.
Based on this comment by vel2000:
http://ffmpeg.org/trac/ffmpeg/ticket/1642#comment:17
Stefano Sabatini [Fri, 31 Aug 2012 21:55:11 +0000 (23:55 +0200)]
lavfi: when configuring a link, set channel layout from previous link if unspecified
In avfilter_config_links(), if the current channel layout is not
specified, set the same value of the previous link in the filterchain.
Consistent with the logic used to set the other link parameters.
Stefano Sabatini [Sat, 1 Sep 2012 14:11:53 +0000 (16:11 +0200)]
lavc/codec_desc: fix name of wavesynth codec
Michael Niedermayer [Sun, 2 Sep 2012 03:01:08 +0000 (05:01 +0200)]
flvdec: fix creation of lots of phantom data streams
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
jamal [Sat, 1 Sep 2012 16:36:10 +0000 (13:36 -0300)]
configure: Treat warnings as errors in check_yasm()
yasm generates a warning instead of an error when "CPU amdnop" is not supported, so the check always succeeds.
HAVE_CPUNOP as true when the available yasm version doesn't support amdnop doesn't make sense.
Check http://fate.ffmpeg.org/log.cgi?time=
20120901143315 &log=compile&slot=x86_64-archlinux-gcc-oldyasm to see the amount of warnings it generates.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 1 Sep 2012 19:16:18 +0000 (21:16 +0200)]
psxstr: more correct array type.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Roman Arutyunyan [Sat, 1 Sep 2012 09:04:57 +0000 (13:04 +0400)]
fix flv new stream handling after head already parsed
This fixes stream lookup in flv demuxer. When used with librtmp
protocol streams are sometimes added after head arrived. If the
first stream added in flv header reader is Audio stream then it
is messed with Video stream added later in the code patched.
The result is I have 2 Audio streams (first of them is said to have
a video codec like h264) instead of Audio/Video pair.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Piotr Bandurski [Sat, 1 Sep 2012 14:56:11 +0000 (16:56 +0200)]
lavf: add missing new line to some error messages 2
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Piotr Bandurski [Sat, 1 Sep 2012 14:52:34 +0000 (16:52 +0200)]
lavfi/vf_frei0: add missing new line to some error messages
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Piotr Bandurski [Sat, 1 Sep 2012 11:15:11 +0000 (13:15 +0200)]
lavc: add missing new line to some messages
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Piotr Bandurski [Sat, 1 Sep 2012 10:35:14 +0000 (12:35 +0200)]
lavf: add missing new line to some error messages
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Mahendra M [Sat, 1 Sep 2012 13:35:44 +0000 (19:05 +0530)]
Fix libx264 profile listing
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 1 Sep 2012 13:37:03 +0000 (15:37 +0200)]
libmpcodecs: remove unused and half existing vo_fs variable
It breaks linking with suncc sometimes
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Peter Ross [Sat, 1 Sep 2012 05:21:01 +0000 (15:21 +1000)]
ansi: erase screen on first frame
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Peter Ross [Sat, 1 Sep 2012 05:18:19 +0000 (15:18 +1000)]
ansi: support 256-colors
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Peter Ross [Sat, 1 Sep 2012 05:15:45 +0000 (15:15 +1000)]
ansi: support escaped codes where last argument is zero
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Peter Ross [Sat, 1 Sep 2012 05:15:13 +0000 (15:15 +1000)]
ansi: remove misplaced return
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 1 Sep 2012 12:59:03 +0000 (14:59 +0200)]
Merge remote-tracking branch 'cus/stable'
* cus/stable:
ffplay: only free vfilters on exit
ffplay: replace SDL_delay in read thread with SDL_CondWait
ffplay: requeue last picture on forced video refresh
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 1 Sep 2012 12:22:58 +0000 (14:22 +0200)]
Merge remote-tracking branch 'stev47/master'
* stev47/master:
cpia: move reget_buffer after header check
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 1 Sep 2012 12:09:32 +0000 (14:09 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
crypto: Remove a stray double space
Rename missed cases of FF_OPT_TYPE_* to AV_OPT_TYPE_*
Conflicts:
libavfilter/vf_delogo.c
libavfilter/vf_lut.c
libavfilter/vsrc_testsrc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Sat, 1 Sep 2012 08:59:16 +0000 (10:59 +0200)]
Fix compilation with yasm-0.6.2.
Stephan Hilb [Sat, 1 Sep 2012 08:16:56 +0000 (10:16 +0200)]
Merge branch 'master' of git://source.ffmpeg.org/ffmpeg
Stephan Hilb [Sat, 1 Sep 2012 08:12:33 +0000 (10:12 +0200)]
cpia: move reget_buffer after header check
If the header is invalid, there is no need to get at buffer.
Do it after the header has been checked.
Suggested by Reimar Döffinger
Stefano Sabatini [Fri, 31 Aug 2012 14:12:38 +0000 (16:12 +0200)]
lavfi/mp: remove decimate wrapper
It was natively integrated into libavfilter.
Michael Niedermayer [Fri, 31 Aug 2012 20:13:16 +0000 (22:13 +0200)]
avoid ambigous buffersink names
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 31 Aug 2012 20:02:08 +0000 (22:02 +0200)]
libavfilter: Support the forks ABI for buffer sinks
With this change avconv compiled against libav and linked to ffmpegs libs
will run through the whole fate testsuite without any crashes.
857 tests pass, the remaining tests fail one way or another, which is
to be expected as avconv is not a drop in replacement for ffmpeg
The testsuite used was the ffmpeg fate testsuite, not libavs.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Philip Langdale [Wed, 23 May 2012 04:50:02 +0000 (21:50 -0700)]
matroskadec, matroskadec, srtenc: Read/Write duration for subtitles.
After much discussion and back-and-forth, we reached the conclusion
that matroska uses convergence_duration for subtitle duration because
a 32bit value isn't large enough to store the duration if sub-micro-second
timebases are used. Matroska may not be the only one that supports these
timebases, but it's certainly the only one that ffmpeg attempts to support
in this way.
The long term solution that we seemed to reach was that if we encounter
a matroska file with a sub-micro-second timebase, we should internally
scale it up to at least micro-second, and then duration can be used
normally. This suggests that on the encode side, we should not allow
generation of files with sub-micro-second timebases, but that's a separate
issue.
That being a non-trivial change, and the subtitle interoperability breakage
being very real, I'm re-submitting this small change for consideration.
In this diff, we make sure that duration is populated by the matroska
demuxer, and that convergence_duration is respected in matroskaenc and
srtenc, but that duration is used otherwise. This ends up being a strict
improvement - pipelines that use convergence duration are unchanged, and
ones that are currently broken due to the duration mismatch will start
working - except for the ones with the extreme timebases, but those were
already broken.
Signed-off-by: Philip Langdale <philipl@overt.org>
Michael Niedermayer [Fri, 31 Aug 2012 23:54:40 +0000 (01:54 +0200)]
fate-utvideoenc: remove unneeded -f avi
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 31 Aug 2012 23:20:54 +0000 (01:20 +0200)]
swr/resample: update SSSE3 flag to new name
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Thu, 30 Aug 2012 21:51:49 +0000 (00:51 +0300)]
crypto: Remove a stray double space
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Fri, 31 Aug 2012 10:29:36 +0000 (13:29 +0300)]
Rename missed cases of FF_OPT_TYPE_* to AV_OPT_TYPE_*
Signed-off-by: Martin Storsjö <martin@martin.st>
Piotr Bandurski [Fri, 31 Aug 2012 18:57:42 +0000 (20:57 +0200)]
flic: use AV_LOG_ERROR for error message
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Piotr Bandurski [Fri, 31 Aug 2012 18:50:20 +0000 (20:50 +0200)]
filmstripdec: add new line to error message
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 31 Aug 2012 18:35:27 +0000 (20:35 +0200)]
lavc: support building with the forks ABI for avcodec_find_best_pix_fmt2()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 31 Aug 2012 18:34:33 +0000 (20:34 +0200)]
configure: add switch to enable debian/libav compatible ABI
needed for avcodec_find_best_pix_fmt2()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 31 Aug 2012 18:18:43 +0000 (20:18 +0200)]
avfiltergraph: use avcodec_find_best_pix_fmt_of_2()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 31 Aug 2012 18:18:24 +0000 (20:18 +0200)]
ffmpeg_filter: use avcodec_find_best_pix_fmt_of_2()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 24 Jul 2012 23:37:38 +0000 (01:37 +0200)]
imgconvert: add avcodec_find_best_pix_fmt_of_2()
and deprecate avcodec_find_best_pix_fmt2()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Marton Balint [Wed, 29 Aug 2012 21:56:33 +0000 (23:56 +0200)]
ffplay: only free vfilters on exit
Freeing it in the end of the video thread is not a good idea, because we still
may need the filter names for the next video thread, in order to apply the
filters after chaning the video stream.
Signed-off-by: Marton Balint <cus@passwd.hu>