ffmpeg.git
8 years agobink: fix pointer type warnings.
Michael Niedermayer [Mon, 6 Feb 2012 18:26:58 +0000 (19:26 +0100)]
bink: fix pointer type warnings.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoffmpeg: better dox for *pts.
Michael Niedermayer [Wed, 8 Feb 2012 18:17:03 +0000 (19:17 +0100)]
ffmpeg: better dox for *pts.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agolavu: add timestamp.h header with convenience timestamp utilities
Stefano Sabatini [Tue, 17 Jan 2012 16:12:42 +0000 (17:12 +0100)]
lavu: add timestamp.h header with convenience timestamp utilities

8 years agoconfigure: fix gcc asm tests for MinGW GCC 4.6.2
Laurent [Thu, 9 Feb 2012 16:49:22 +0000 (17:49 +0100)]
configure: fix gcc asm tests for MinGW GCC 4.6.2

Thanks to stackoverflow
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 8 Feb 2012 23:44:20 +0000 (00:44 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  pixdesc: mark pseudopaletted formats with a special flag.
  avconv: switch to avcodec_encode_video2().
  libx264: implement encode2().
  libx264: split extradata writing out of encode_nals().
  lavc: add avcodec_encode_video2() that encodes from an AVFrame -> AVPacket
  cmdutils: update copyright year to 2012.
  swscale: sign-extend integer function argument to qword on x86-64.
  x86inc: support yasm -f win64 flag also.
  h264: manually save/restore XMM registers for functions using INIT_MMX.
  x86inc: allow manual use of WIN64_SPILL_XMM.
  aacdec: Use correct speaker order for 7.1.
  aacdec: Remove incorrect comment.
  aacdec: Simplify output configuration.
  Remove Sun medialib glue code.
  dsputil: set STRIDE_ALIGN to 16 for x86 also.
  pngdsp: swap argument inversion.

Conflicts:
cmdutils.c
configure
doc/APIchanges
ffmpeg.c
libavcodec/aacdec.c
libavcodec/dsputil.h
libavcodec/libx264.c
libavcodec/mlib/dsputil_mlib.c
libavcodec/utils.c
libavfilter/vf_scale.c
libavutil/avutil.h
libswscale/mlib/yuv2rgb_mlib.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoffmpeg: change sync_opts code to be more similar to qatar.
Michael Niedermayer [Wed, 8 Feb 2012 22:14:28 +0000 (23:14 +0100)]
ffmpeg: change sync_opts code to be more similar to qatar.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoRevert "vf_fspp: use LOCAL_MANGLE instead of MANGLE."
Clément Bœsch [Wed, 8 Feb 2012 22:16:32 +0000 (23:16 +0100)]
Revert "vf_fspp: use LOCAL_MANGLE instead of MANGLE."

This reverts commit 1aa8f5fcfba6701eb0181ea07c070d09ab0f4efd. It broke
the other x86_32 fate instances.

8 years agopixdesc: mark pseudopaletted formats with a special flag.
Anton Khirnov [Wed, 1 Feb 2012 14:32:21 +0000 (15:32 +0100)]
pixdesc: mark pseudopaletted formats with a special flag.

This makes it possible to dintinguish them from PAL8.

Fixes an invalid write in avpicture_layout().

8 years agoavconv: switch to avcodec_encode_video2().
Anton Khirnov [Wed, 1 Feb 2012 09:51:36 +0000 (10:51 +0100)]
avconv: switch to avcodec_encode_video2().

8 years agolibx264: implement encode2().
Anton Khirnov [Mon, 6 Feb 2012 06:39:23 +0000 (07:39 +0100)]
libx264: implement encode2().

8 years agolibx264: split extradata writing out of encode_nals().
Anton Khirnov [Mon, 6 Feb 2012 06:34:57 +0000 (07:34 +0100)]
libx264: split extradata writing out of encode_nals().

This is done in preparation for the following patch.

8 years agolavc: add avcodec_encode_video2() that encodes from an AVFrame -> AVPacket
Anton Khirnov [Wed, 1 Feb 2012 08:54:38 +0000 (09:54 +0100)]
lavc: add avcodec_encode_video2() that encodes from an AVFrame -> AVPacket

Deprecate avcodec_encode_video().

8 years agolagarith: refactor code
Paul B Mahol [Wed, 8 Feb 2012 17:35:47 +0000 (17:35 +0000)]
lagarith: refactor code

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agovf_fspp: use LOCAL_MANGLE instead of MANGLE.
Clément Bœsch [Mon, 6 Feb 2012 18:19:00 +0000 (19:19 +0100)]
vf_fspp: use LOCAL_MANGLE instead of MANGLE.

The symbols are locals, thus the EXTERN_PREFIX should be omitted. This
might fix the llvm-gcc fate instance.

8 years agocmdutils: update copyright year to 2012.
Ronald S. Bultje [Wed, 8 Feb 2012 18:16:41 +0000 (10:16 -0800)]
cmdutils: update copyright year to 2012.

8 years agoswscale: sign-extend integer function argument to qword on x86-64.
Ronald S. Bultje [Sat, 4 Feb 2012 09:27:45 +0000 (10:27 +0100)]
swscale: sign-extend integer function argument to qword on x86-64.

8 years agox86inc: support yasm -f win64 flag also.
Haruhiko Yamagata [Tue, 7 Feb 2012 20:27:33 +0000 (12:27 -0800)]
x86inc: support yasm -f win64 flag also.

This sets __OUTPUT_FORMAT__ to win64 instead of win32, even though both
(through -m amd64) produce 64-bit binary code.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
8 years agoh264: manually save/restore XMM registers for functions using INIT_MMX.
Ronald S. Bultje [Tue, 7 Feb 2012 20:46:59 +0000 (12:46 -0800)]
h264: manually save/restore XMM registers for functions using INIT_MMX.

On Win64, these registers are callee-save, so not saving/restoring them
correctly is a violation of ABI and can lead to crashes or corrupt data.

8 years agox86inc: allow manual use of WIN64_SPILL_XMM.
Henrik Gramner [Sat, 4 Feb 2012 08:28:46 +0000 (00:28 -0800)]
x86inc: allow manual use of WIN64_SPILL_XMM.

Functions using INIT_MMX may still access XMM registers through direct
means (xmm0-15). Therefore, they still need to be marked for clobber
so they can be properly saved/restored.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
8 years agoaacdec: Use correct speaker order for 7.1.
Alex Converse [Tue, 31 Jan 2012 22:25:35 +0000 (14:25 -0800)]
aacdec: Use correct speaker order for 7.1.

The spec says the following speaker mapping is default:
center front speaker
left, right center front speakers,
left, right outside front speakers,
left surround, right surround rear speakers,
front low frequency effects speaker

8 years agoaacdec: Remove incorrect comment.
Alex Converse [Tue, 31 Jan 2012 23:49:45 +0000 (15:49 -0800)]
aacdec: Remove incorrect comment.

It was only correct when element ids met very specific criteria.

8 years agoaacdec: Simplify output configuration.
Alex Converse [Tue, 31 Jan 2012 23:49:06 +0000 (15:49 -0800)]
aacdec: Simplify output configuration.

8 years agoffmpeg: update (next_)pts in the stream copy case
Michael Niedermayer [Wed, 8 Feb 2012 16:26:06 +0000 (17:26 +0100)]
ffmpeg: update (next_)pts in the stream copy case

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoffmpeg: use ist->dts in rate_emu_sleep()
Michael Niedermayer [Wed, 8 Feb 2012 16:25:40 +0000 (17:25 +0100)]
ffmpeg: use ist->dts in rate_emu_sleep()

Based on change by Anton Khirnov.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoffmpeg: use ist->dts in do_streamcopy()
Michael Niedermayer [Wed, 8 Feb 2012 16:25:01 +0000 (17:25 +0100)]
ffmpeg: use ist->dts in do_streamcopy()

Based on change by Anton Khirnov.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoffmpeg: remove setting fb->pts.
Anton Khirnov [Wed, 8 Feb 2012 15:59:16 +0000 (16:59 +0100)]
ffmpeg: remove setting fb->pts.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoffmpeg: reduce overloading for InputStream.pts.
Anton Khirnov [Sun, 5 Feb 2012 19:56:24 +0000 (20:56 +0100)]
ffmpeg: reduce overloading for InputStream.pts.

It currently has different meanings at different times (dts of the last
read packet/pts of the last decoded frame). Reduce obfuscation by
storing pts of the decoded frame in the frame itself.

Conflicts:

ffmpeg.c

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoffmpeg: update dts variables in transcode_audio()
Michael Niedermayer [Wed, 8 Feb 2012 15:28:56 +0000 (16:28 +0100)]
ffmpeg: update dts variables in transcode_audio()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoffmpeg: move next_dts/pts update out of transcode_video()
Michael Niedermayer [Wed, 8 Feb 2012 15:16:42 +0000 (16:16 +0100)]
ffmpeg: move next_dts/pts update out of transcode_video()
this makes it placed similar to qatar

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoffmpeg: update ist->pts in transcode_audio with the audio decoders output.
Michael Niedermayer [Wed, 8 Feb 2012 15:15:47 +0000 (16:15 +0100)]
ffmpeg: update ist->pts in transcode_audio with the audio decoders output.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoffmpeg: print more details and rescaled timestamps in debug code.
Michael Niedermayer [Wed, 8 Feb 2012 14:49:21 +0000 (15:49 +0100)]
ffmpeg: print more details and rescaled timestamps in debug code.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoffmpeg: use (next_)dts in timestamp discontinuity detection code.
Michael Niedermayer [Wed, 8 Feb 2012 07:21:58 +0000 (08:21 +0100)]
ffmpeg: use (next_)dts in timestamp discontinuity detection code.

Strongly based on Anton Khirnovs code.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoRemove Sun medialib glue code.
Diego Biurrun [Wed, 1 Feb 2012 13:43:06 +0000 (14:43 +0100)]
Remove Sun medialib glue code.

It is obscure, most likely unused and not bit-exact compared to
libavcodec due to a different IDCT transform algorithm.

8 years agoffmpeg: Use the correct (dts) variables for stream copy.
Michael Niedermayer [Wed, 8 Feb 2012 06:56:53 +0000 (07:56 +0100)]
ffmpeg: Use the correct (dts) variables for stream copy.

Strongly based on Anton Khirnovs code.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoffmpeg: Fix (next)_dts/pts init.
Michael Niedermayer [Wed, 8 Feb 2012 06:56:17 +0000 (07:56 +0100)]
ffmpeg: Fix (next)_dts/pts init.

Based on Anton Khirnovs code.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoffmpeg: use ist->dts instead of passing an argument into transcode_video().
Michael Niedermayer [Wed, 8 Feb 2012 05:31:06 +0000 (06:31 +0100)]
ffmpeg: use ist->dts instead of passing an argument into transcode_video().

This makes the code more similar to qatar
And fixes decoding of the last frame of fate/vc1-ism

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoffmpeg: Init dts variables in output_packet()
Michael Niedermayer [Wed, 8 Feb 2012 05:19:43 +0000 (06:19 +0100)]
ffmpeg: Init dts variables in output_packet()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoffmpeg: add (next_dts/dts) variables.
Michael Niedermayer [Wed, 8 Feb 2012 05:13:44 +0000 (06:13 +0100)]
ffmpeg: add (next_dts/dts) variables.

Strongly based on Anton Khirnovs code.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 8 Feb 2012 01:59:09 +0000 (02:59 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  swscale: make yuv2yuv1 use named registers.
  h264: mark h264_idct_add8_10 with number of XMM registers.
  swscale: fix V plane memory location in bilinear/unscaled RGB/YUYV case.
  vp8: always update next_framep[] before returning from decode_frame().
  avconv: estimate next_dts from framerate if it is set.
  avconv: better next_dts usage.
  avconv: rename InputStream.pts to last_dts.
  avconv: reduce overloading for InputStream.pts.
  avconv: rename InputStream.next_pts to next_dts.
  avconv: rework -t handling for encoding.
  avconv: set encoder timebase for subtitles.
  pva-demux test: add -vn
  swscale: K&R formatting cosmetics for SPARC code
  apedec: allow the user to set the maximum number of output samples per call
  apedec: do not unnecessarily zero output samples for mono frames
  apedec: allocate a single flat buffer for decoded samples
  apedec: use sizeof(field) instead of sizeof(type)
  swscale: split C output functions into separate file.
  swscale: Split C input functions into separate file.
  bytestream: Add bytestream2 writing API.

The avconv changes are due to massive regressions and bugs not merged yet.

Conflicts:
ffmpeg.c
libavcodec/vp8.c
libswscale/swscale.c
libswscale/x86/swscale_template.c
tests/fate/demux.mak
tests/ref/lavf/asf
tests/ref/lavf/avi
tests/ref/lavf/mkv
tests/ref/lavf/mpg
tests/ref/lavf/nut
tests/ref/lavf/ogg
tests/ref/lavf/rm
tests/ref/lavf/ts
tests/ref/seek/lavf_avi
tests/ref/seek/lavf_mkv
tests/ref/seek/lavf_rm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agodsputil: set STRIDE_ALIGN to 16 for x86 also.
Ronald S. Bultje [Tue, 7 Feb 2012 22:54:46 +0000 (14:54 -0800)]
dsputil: set STRIDE_ALIGN to 16 for x86 also.

This fixes crashes in e.g. PNG decoding with SSE2 enabled. In fact, many
x86 optimizations for codecs assume that our buffer strides are 16-byte
aligned.

8 years agopngdsp: swap argument inversion.
Ronald S. Bultje [Tue, 7 Feb 2012 20:51:21 +0000 (12:51 -0800)]
pngdsp: swap argument inversion.

8 years agoSet default qmax for VC-3/DNxHD to 1024 (maximum allowed by VC-3 spec).
Joseph Artsimovich [Tue, 7 Feb 2012 15:47:23 +0000 (15:47 +0000)]
Set default qmax for VC-3/DNxHD to 1024 (maximum allowed by VC-3 spec).

Also increase the global limit on qmax.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoswscale: make yuv2yuv1 use named registers.
Ronald S. Bultje [Sat, 4 Feb 2012 09:00:27 +0000 (10:00 +0100)]
swscale: make yuv2yuv1 use named registers.

8 years agoh264: mark h264_idct_add8_10 with number of XMM registers.
Michael Kostylev [Sat, 4 Feb 2012 08:16:35 +0000 (00:16 -0800)]
h264: mark h264_idct_add8_10 with number of XMM registers.

This fixes XMM register clobber problems on Win64.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
8 years agoswscale: fix V plane memory location in bilinear/unscaled RGB/YUYV case.
Ronald S. Bultje [Tue, 7 Feb 2012 19:33:20 +0000 (11:33 -0800)]
swscale: fix V plane memory location in bilinear/unscaled RGB/YUYV case.

Fixes bug 221.

CC: libav-stable@libav.org
8 years agovp8: always update next_framep[] before returning from decode_frame().
Ronald S. Bultje [Tue, 31 Jan 2012 23:17:59 +0000 (15:17 -0800)]
vp8: always update next_framep[] before returning from decode_frame().

Also slightly move around code not allocate a new frame if we won't
decode it. This prevents us from putting undecoded frames in frame
pointers, which (in mt decoding) other threads will use and wait on
as references, causing a deadlock (if we skipped decoding) or a crash
(if we didn't initialized next_framep[] at all).

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
8 years agoavconv: estimate next_dts from framerate if it is set.
Anton Khirnov [Thu, 2 Feb 2012 12:18:49 +0000 (13:18 +0100)]
avconv: estimate next_dts from framerate if it is set.

8 years agoavconv: better next_dts usage.
Anton Khirnov [Thu, 2 Feb 2012 11:21:37 +0000 (12:21 +0100)]
avconv: better next_dts usage.

next_dts is used for estimating the dts of the next packet if it's
missing. Therefore, it makes no sense to set it from the pts of the last
decoded frame. Also it should be estimated from the current packet
duration/ticks_per_frame always, not only when a frame was successfully
decoded.

8 years agoavconv: rename InputStream.pts to last_dts.
Anton Khirnov [Sun, 5 Feb 2012 20:12:43 +0000 (21:12 +0100)]
avconv: rename InputStream.pts to last_dts.

It more accurately describes what does this variable store.

8 years agoavconv: reduce overloading for InputStream.pts.
Anton Khirnov [Sun, 5 Feb 2012 19:56:24 +0000 (20:56 +0100)]
avconv: reduce overloading for InputStream.pts.

It currently has different meanings at different times (dts of the last
read packet/pts of the last decoded frame). Reduce obfuscation by
storing pts of the decoded frame in the frame itself.

8 years agoavconv: rename InputStream.next_pts to next_dts.
Anton Khirnov [Fri, 3 Feb 2012 14:32:51 +0000 (15:32 +0100)]
avconv: rename InputStream.next_pts to next_dts.

It's used to predict dts, not pts.

8 years agoavconv: rework -t handling for encoding.
Anton Khirnov [Sun, 5 Feb 2012 13:32:10 +0000 (14:32 +0100)]
avconv: rework -t handling for encoding.

Current code compares the desired recording time with InputStream.pts,
which has a very unclear meaning. Change the code to use actual
timestamps of the frames passed to the encoder.

In several tests, one less frame is encoded, which is more correct.

In the idroq test one more frame is encoded, which is again more
correct.

Behavior with stream copy should be unchanged.

8 years agoavconv: set encoder timebase for subtitles.
Anton Khirnov [Sun, 5 Feb 2012 13:28:19 +0000 (14:28 +0100)]
avconv: set encoder timebase for subtitles.

The actual number (1/1000) will probably require some
discussion/tweaking in the future, but should be good enough for now,
since the timestamps in AVSubtitle are in this timebase by definition.

8 years agopva-demux test: add -vn
Anton Khirnov [Sun, 5 Feb 2012 11:18:14 +0000 (12:18 +0100)]
pva-demux test: add -vn

The output is obviously not supposed to contain video (since only
-acodec copy is specified), but that only happens because of the way -t
handling is implemented currently.

8 years agoswscale: K&R formatting cosmetics for SPARC code
Diego Biurrun [Wed, 18 Jan 2012 17:33:16 +0000 (18:33 +0100)]
swscale: K&R formatting cosmetics for SPARC code

8 years agoFix libutvideo compilation.
Carl Eugen Hoyos [Tue, 7 Feb 2012 17:28:00 +0000 (18:28 +0100)]
Fix libutvideo compilation.

Fixes ticket #985.

8 years agoapedec: allow the user to set the maximum number of output samples per call
Justin Ruggles [Mon, 6 Feb 2012 22:46:41 +0000 (17:46 -0500)]
apedec: allow the user to set the maximum number of output samples per call

It makes sense in some cases to split up the output packet to save on memory
usage (ape frames can be very large), but the current/default size is
arbitrary. Allowing the user to configure this gives more flexibility and
requires minimal additional code.

8 years agoapedec: do not unnecessarily zero output samples for mono frames
Justin Ruggles [Mon, 6 Feb 2012 21:34:50 +0000 (16:34 -0500)]
apedec: do not unnecessarily zero output samples for mono frames

8 years agoapedec: allocate a single flat buffer for decoded samples
Justin Ruggles [Mon, 6 Feb 2012 21:31:26 +0000 (16:31 -0500)]
apedec: allocate a single flat buffer for decoded samples

This will allow the decoder to return samples for the full packet, and it also
makes the decoded buffer pointers aligned.

8 years agoapedec: use sizeof(field) instead of sizeof(type)
Justin Ruggles [Mon, 6 Feb 2012 18:36:42 +0000 (13:36 -0500)]
apedec: use sizeof(field) instead of sizeof(type)

8 years agolavfi/aspect: rename field aspect->aspect to aspect->ratio
Stefano Sabatini [Tue, 24 Jan 2012 21:47:32 +0000 (22:47 +0100)]
lavfi/aspect: rename field aspect->aspect to aspect->ratio

The new name is more sensible.

8 years agolavc: provide aliases to the PCM A-law/mu-law codecs
Stefano Sabatini [Mon, 6 Feb 2012 21:03:13 +0000 (22:03 +0100)]
lavc: provide aliases to the PCM A-law/mu-law codecs

They are also known as G.711 codecs.

8 years agoswscale: split C output functions into separate file.
Ronald S. Bultje [Wed, 1 Feb 2012 15:38:56 +0000 (07:38 -0800)]
swscale: split C output functions into separate file.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
8 years agoswscale: Split C input functions into separate file.
Ronald S. Bultje [Wed, 1 Feb 2012 15:38:55 +0000 (07:38 -0800)]
swscale: Split C input functions into separate file.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
8 years agoffserver: use avcodec_get_context_defaults3()
Paul B Mahol [Sun, 5 Feb 2012 22:53:31 +0000 (22:53 +0000)]
ffserver: use avcodec_get_context_defaults3()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 7 Feb 2012 00:40:29 +0000 (01:40 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  Revert "v210enc: use FFALIGN()"
  doxygen: Do not include license boilerplates in Doxygen comment blocks.
  avplay: reset decoder flush state when seeking
  ape: skip packets with invalid size
  ape: calculate final packet size instead of guessing
  ape: stop reading after the last frame has been read
  ape: return AVERROR_EOF instead of AVERROR(EIO) when demuxing is finished
  ape: return error if seeking to the current packet fails in ape_read_packet()
  avcodec: Clarify AVFrame member documentation.
  v210dec: check for coded_frame allocation failure
  v210enc: use stride as it is already calculated
  v210enc: use FFALIGN()
  v210enc: return proper AVERROR codes instead of -1
  v210enc: do not set coded_frame->key_frame
  v210enc: check for coded_frame allocation failure
  drawtext: add 'fix_bounds' option on coords fixing
  drawtext: fix text_{w, h} expression vars
  drawtext: add missing braces around an if() block.

Conflicts:
libavcodec/arm/vp8.h
libavcodec/arm/vp8dsp_init_arm.c
libavcodec/v210dec.c
libavfilter/vf_drawtext.c
libavformat/ape.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agobytestream: Add bytestream2 writing API.
Aneesh Dogra [Mon, 6 Feb 2012 20:09:22 +0000 (01:39 +0530)]
bytestream: Add bytestream2 writing API.

Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
8 years agoutvideo: remove ff_thread_finish_setup, it isn't needed at all
Paul B Mahol [Mon, 6 Feb 2012 21:30:29 +0000 (21:30 +0000)]
utvideo: remove ff_thread_finish_setup, it isn't needed at all

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoDetect theora keyframes by content in Ogg demuxer.
Reimar Döffinger [Mon, 6 Feb 2012 21:03:25 +0000 (22:03 +0100)]
Detect theora keyframes by content in Ogg demuxer.

A lot of files do not mark keyframes correctly via
granule, so detect keyframe or not based on data
and complain if it mismatches.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
8 years agoffv1: PIX_FMT_GRAY16 support
Paul B Mahol [Mon, 6 Feb 2012 18:23:44 +0000 (18:23 +0000)]
ffv1: PIX_FMT_GRAY16 support

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoDNxHD: remove ff_thread_finish_setup, it isn't needed at all.
Javier Cabezas [Mon, 6 Feb 2012 18:36:39 +0000 (19:36 +0100)]
DNxHD: remove ff_thread_finish_setup, it isn't needed at all.

Should fix issue #938

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoffmpeg: document the unit for the -fs option parameter
Stefano Sabatini [Wed, 18 Jan 2012 12:13:41 +0000 (13:13 +0100)]
ffmpeg: document the unit for the -fs option parameter

8 years agolavfi: add setfield filter
Stefano Sabatini [Wed, 1 Feb 2012 23:31:00 +0000 (00:31 +0100)]
lavfi: add setfield filter

8 years agolavf/4xm: use proper error codes
Stefano Sabatini [Mon, 6 Feb 2012 09:46:53 +0000 (10:46 +0100)]
lavf/4xm: use proper error codes

8 years agoRevert "v210enc: use FFALIGN()"
Paul B Mahol [Mon, 6 Feb 2012 17:54:39 +0000 (17:54 +0000)]
Revert "v210enc: use FFALIGN()"

FFALIGN doesn't work with non-powers-of-2.

This reverts commit 7ad1b612c8a2a1b1b47f6c3c580ced4bca17e1c7.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agodoxygen: Do not include license boilerplates in Doxygen comment blocks.
Diego Biurrun [Sun, 5 Feb 2012 10:31:33 +0000 (11:31 +0100)]
doxygen: Do not include license boilerplates in Doxygen comment blocks.

8 years agoavplay: reset decoder flush state when seeking
Justin Ruggles [Sat, 4 Feb 2012 22:32:26 +0000 (17:32 -0500)]
avplay: reset decoder flush state when seeking

Fixes seeking after decoder has already been flushed for codecs using
CODEC_CAP_DELAY.

8 years agoape: skip packets with invalid size
Justin Ruggles [Sat, 4 Feb 2012 22:08:34 +0000 (17:08 -0500)]
ape: skip packets with invalid size

8 years agoape: calculate final packet size instead of guessing
Justin Ruggles [Sat, 4 Feb 2012 22:01:03 +0000 (17:01 -0500)]
ape: calculate final packet size instead of guessing

Calculates based on total file size and wavetaillength from the header.
Falls back to multiplying finalframeblocks by 8 instead of 4 so that it will
at least be overestimating for 24-bit. Currently it can underestimate the
final packet size, leading to decoding errors.

8 years agoape: stop reading after the last frame has been read
Justin Ruggles [Sat, 4 Feb 2012 21:34:20 +0000 (16:34 -0500)]
ape: stop reading after the last frame has been read

This avoids buffer overread when the last packet size estimate is too small.

8 years agoape: return AVERROR_EOF instead of AVERROR(EIO) when demuxing is finished
Justin Ruggles [Sat, 4 Feb 2012 21:31:37 +0000 (16:31 -0500)]
ape: return AVERROR_EOF instead of AVERROR(EIO) when demuxing is finished

8 years agoape: return error if seeking to the current packet fails in ape_read_packet()
Justin Ruggles [Sat, 4 Feb 2012 21:29:37 +0000 (16:29 -0500)]
ape: return error if seeking to the current packet fails in ape_read_packet()

8 years agoavcodec: Clarify AVFrame member documentation.
Kieran Kunhya [Sun, 5 Feb 2012 10:28:58 +0000 (04:28 -0600)]
avcodec: Clarify AVFrame member documentation.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
8 years agodoc/filters.texi: use multiple @example blocks for distinct examples in setdar docs
Stefano Sabatini [Tue, 24 Jan 2012 22:50:33 +0000 (23:50 +0100)]
doc/filters.texi: use multiple @example blocks for distinct examples in setdar docs

8 years agodoc/filters.texi: prefer @example over the unsupported @math for showing equation
Stefano Sabatini [Tue, 24 Jan 2012 22:32:49 +0000 (23:32 +0100)]
doc/filters.texi: prefer @example over the unsupported @math for showing equation

8 years agodoc/filters.texi: merge setdar and setsar documentation
Stefano Sabatini [Tue, 24 Jan 2012 22:28:26 +0000 (23:28 +0100)]
doc/filters.texi: merge setdar and setsar documentation

Most of the documentation is common to both filters, and I'm going to add
more shared docs. Factorize.

8 years agolavu: introduce av_parse_ratio() and use it in ffmpeg and lavfi/aspect
Stefano Sabatini [Tue, 17 Jan 2012 14:25:14 +0000 (15:25 +0100)]
lavu: introduce av_parse_ratio() and use it in ffmpeg and lavfi/aspect

Factorize code and provide ratio parsing consistency.

8 years agoffprobe: fix typo in ESCAPE_CHECK_SIZE
Stefano Sabatini [Mon, 6 Feb 2012 09:44:54 +0000 (10:44 +0100)]
ffprobe: fix typo in ESCAPE_CHECK_SIZE

8 years agov210dec: check for coded_frame allocation failure
Paul B Mahol [Sun, 5 Feb 2012 21:14:39 +0000 (21:14 +0000)]
v210dec: check for coded_frame allocation failure

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agov210enc: use stride as it is already calculated
Paul B Mahol [Sun, 5 Feb 2012 21:14:38 +0000 (21:14 +0000)]
v210enc: use stride as it is already calculated

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agov210enc: use FFALIGN()
Paul B Mahol [Sun, 5 Feb 2012 21:14:37 +0000 (21:14 +0000)]
v210enc: use FFALIGN()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agov210enc: return proper AVERROR codes instead of -1
Paul B Mahol [Sun, 5 Feb 2012 21:14:36 +0000 (21:14 +0000)]
v210enc: return proper AVERROR codes instead of -1

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agov210enc: do not set coded_frame->key_frame
Paul B Mahol [Sun, 5 Feb 2012 21:14:35 +0000 (21:14 +0000)]
v210enc: do not set coded_frame->key_frame

It is already set in avcodec_alloc_frame().

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agov210enc: check for coded_frame allocation failure
Paul B Mahol [Sun, 5 Feb 2012 21:14:34 +0000 (21:14 +0000)]
v210enc: check for coded_frame allocation failure

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agodrawtext: add 'fix_bounds' option on coords fixing
Andrey Utkin [Sun, 5 Feb 2012 12:41:01 +0000 (14:41 +0200)]
drawtext: add 'fix_bounds' option on coords fixing

Before, drawtext filter deliberately altered given text coordinates if
text didn't fully fit on the picture. This breaks the use case of
scrolling large text, e.g. movie closing credits.
Add 'fix_bounds', to make it usable in such cases (by setting its value to 0).
Default behavior is not changed, and non-fitting text coords are fixed.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agodrawtext: fix text_{w, h} expression vars
Andrey Utkin [Sat, 4 Feb 2012 22:14:16 +0000 (00:14 +0200)]
drawtext: fix text_{w, h} expression vars

Before, {text_,}{w,h} vars hadn't got initialized

Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agocache: fix "warning: passing argument 2 of ‘av_tempfile’ from incompatible pointer...
Michael Niedermayer [Mon, 6 Feb 2012 00:02:45 +0000 (01:02 +0100)]
cache: fix "warning: passing argument 2 of ‘av_tempfile’ from incompatible pointer type"

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agofix "warning: variable ‘cflags’ set but not used"
Michael Niedermayer [Mon, 6 Feb 2012 00:02:07 +0000 (01:02 +0100)]
fix "warning: variable ‘cflags’ set but not used"

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoavio: Fix "warning: initialization from incompatible pointer type"
Michael Niedermayer [Sun, 5 Feb 2012 22:21:51 +0000 (23:21 +0100)]
avio: Fix "warning: initialization from incompatible pointer type"

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agochangelog: fix typo
Paul B Mahol [Sun, 5 Feb 2012 23:31:12 +0000 (00:31 +0100)]
changelog: fix typo