]>
git.sesse.net Git - ffmpeg/log
William Yu [Tue, 14 Jun 2011 15:16:51 +0000 (17:16 +0200)]
mjpegenc: Fix JFIF version
Philip Langdale [Mon, 13 Jun 2011 03:22:20 +0000 (20:22 -0700)]
CrystalHD: Use mp4toannexb bitstream filter.
The H.264 parser that we use to detect interlacing can only handle
an Annex B stream, so we need to actually use the filter. This is
unfortunate as the crystalhd library is already doing this conversion
internally. A future change will reorganise the decode path more
completely so that we can feed the converted stream into libcrystalhd
and avoid the second conversion.
Signed-off-by: Philip Langdale <philipl@overt.org>
Philip Langdale [Mon, 13 Jun 2011 03:21:28 +0000 (20:21 -0700)]
CrystalHD: Keep mp4toannexb filter around for entire decoder lifetime.
In preparation for using the filter on the actual bitstream, we need
to extend it's lifetime to match that of the decoder.
Signed-off-by: Philip Langdale <philipl@overt.org>
Michael Niedermayer [Tue, 14 Jun 2011 02:55:27 +0000 (04:55 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master: (24 commits)
utils: Drop pointless '#if 1' preprocessor directive.
ac3enc: remove empty ac3_float function that is never called
ac3enc: split templated float vs. fixed functions into a separate file.
ac3enc: dynamically allocate AC3EncodeContext fields windowed_samples and mdct
ac3enc: use function pointer to choose between AC-3 and E-AC-3 header output functions.
Roll back 4:4:4 H.264 for now Needs some ARM/PPC asm modifications.
Fix SVQ3 after adding 4:4:4 H.264 support
H.264: fix CODEC_FLAG_GRAY
4:4:4 H.264 decoding support
h264_parser: Fix whitespace after previous change.
h264_parser: Fix behaviour when PARSER_FLAG_COMPLETE_FRAMES is set.
wav: remove an invalid free().
lavf: initialise reference_dts in av_estimate_timings_from_pts.
h264: don't be so picky on decoding pps in extradata.
avcodec.h: add or elaborate on some documentation comments.
h264: change a few comments into error messages
ac3dec: fix doxy-style for comment ("///>" should be "///<" instead).
img2: add .dpx to the list of supported file extensions.
ffv1: fix undefined behavior with insane widths.
ARM: jrevdct_arm: simplify stack usage
...
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Aurelien Jacobs [Tue, 14 Jun 2011 00:00:06 +0000 (02:00 +0200)]
matroskadec: properly decode color space in an endian neutral way
Aurelien Jacobs [Mon, 13 Jun 2011 23:58:11 +0000 (01:58 +0200)]
matroskadec: use a temporary fourcc variable
Aurelien Jacobs [Mon, 13 Jun 2011 23:53:40 +0000 (01:53 +0200)]
matroskaenc: ensure the written colorspace don't depend on host endianness
Diego Biurrun [Fri, 10 Jun 2011 18:27:50 +0000 (20:27 +0200)]
utils: Drop pointless '#if 1' preprocessor directive.
Justin Ruggles [Fri, 10 Jun 2011 19:17:55 +0000 (15:17 -0400)]
ac3enc: remove empty ac3_float function that is never called
Justin Ruggles [Fri, 10 Jun 2011 18:57:19 +0000 (14:57 -0400)]
ac3enc: split templated float vs. fixed functions into a separate file.
Function pointers are used for templated functions instead of needlessly
duplicating many functions.
Justin Ruggles [Fri, 10 Jun 2011 16:42:36 +0000 (12:42 -0400)]
ac3enc: dynamically allocate AC3EncodeContext fields windowed_samples and mdct
This will allow the same struct to be used for both the fixed and float ac3
encoders.
Justin Ruggles [Fri, 10 Jun 2011 15:45:03 +0000 (11:45 -0400)]
ac3enc: use function pointer to choose between AC-3 and E-AC-3 header output
functions.
Jason Garrett-Glaser [Mon, 13 Jun 2011 20:38:46 +0000 (13:38 -0700)]
Roll back 4:4:4 H.264 for now
Needs some ARM/PPC asm modifications.
Jason Garrett-Glaser [Mon, 13 Jun 2011 17:21:46 +0000 (10:21 -0700)]
Fix SVQ3 after adding 4:4:4 H.264 support
Jason Garrett-Glaser [Thu, 9 Jun 2011 23:17:41 +0000 (16:17 -0700)]
H.264: fix CODEC_FLAG_GRAY
It was broken in 4:4:4, and still did chroma deblocking for no reason in 4:2:0.
Jason Garrett-Glaser [Fri, 3 Jun 2011 08:12:28 +0000 (01:12 -0700)]
4:4:4 H.264 decoding support
Note: this is 4:4:4 from the 2007 spec revision, not the previous (now deprecated) 4:4:4 mode in H.264.
Philip Langdale [Tue, 29 Mar 2011 04:43:23 +0000 (21:43 -0700)]
h264_parser: Fix whitespace after previous change.
Signed-off-by: Philip Langdale <philipl@overt.org>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Philip Langdale [Tue, 29 Mar 2011 04:42:02 +0000 (21:42 -0700)]
h264_parser: Fix behaviour when PARSER_FLAG_COMPLETE_FRAMES is set.
Currently, the parser is buggy and only processes the stream extradata
when the flag is set. This fixes it to actually inspect the frames.
Whitespce will be fixed in a separate change.
Signed-off-by: Philip Langdale <philipl@overt.org>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Carl Eugen Hoyos [Sun, 3 Apr 2011 20:45:16 +0000 (22:45 +0200)]
wav: remove an invalid free().
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Michael Niedermayer [Tue, 8 Mar 2011 21:39:14 +0000 (22:39 +0100)]
lavf: initialise reference_dts in av_estimate_timings_from_pts.
Fixes issue2437.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Michael Niedermayer [Tue, 1 Mar 2011 14:59:00 +0000 (15:59 +0100)]
h264: don't be so picky on decoding pps in extradata.
Fixes issue2517
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Wim Lewis [Sat, 2 Apr 2011 22:30:24 +0000 (15:30 -0700)]
avcodec.h: add or elaborate on some documentation comments.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Michael Niedermayer [Sat, 2 Apr 2011 15:57:53 +0000 (17:57 +0200)]
h264: change a few comments into error messages
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Reimar Döffinger [Fri, 1 Apr 2011 17:42:31 +0000 (19:42 +0200)]
ac3dec: fix doxy-style for comment ("///>" should be "///<" instead).
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Peter Ross [Fri, 1 Apr 2011 12:11:24 +0000 (23:11 +1100)]
img2: add .dpx to the list of supported file extensions.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Michael Niedermayer [Fri, 1 Apr 2011 10:46:36 +0000 (12:46 +0200)]
ffv1: fix undefined behavior with insane widths.
The new tables is large enough to prevent this together with our image size checks.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Aurelien Jacobs [Mon, 13 Jun 2011 17:02:50 +0000 (19:02 +0200)]
replace remaining usage of deprecated av_metadata_set2() by av_dict_set()
Aurelien Jacobs [Mon, 13 Jun 2011 16:37:32 +0000 (18:37 +0200)]
matroskaenc: write colourspace element for rawvideo tracks
Aurelien Jacobs [Mon, 13 Jun 2011 16:30:55 +0000 (18:30 +0200)]
nsv: simplify probe function
Aurelien Jacobs [Mon, 13 Jun 2011 16:28:54 +0000 (18:28 +0200)]
nsv: return error code instead of discarding it in read_header()
Mans Rullgard [Mon, 13 Jun 2011 08:33:20 +0000 (09:33 +0100)]
ARM: jrevdct_arm: simplify stack usage
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Mon, 13 Jun 2011 08:30:42 +0000 (09:30 +0100)]
ARM: jrevdct_arm: use push/pop mnemonics
Use push/pop instead of stmdb/ldmia for stack operations. This
is the preferred syntax.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Mon, 13 Jun 2011 08:24:27 +0000 (09:24 +0100)]
ARM: jrevdct_arm: misc cleanup
- use 'const' macro to define coeff table
- add missing endfunc
- remove superflous directives
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Sat, 11 Jun 2011 21:53:32 +0000 (22:53 +0100)]
ARM: optimised mpadsp_apply_window_fixed
Signed-off-by: Mans Rullgard <mans@mansr.com>
Reinhard Tartler [Mon, 13 Jun 2011 06:56:54 +0000 (08:56 +0200)]
Add some (important) changelog entries
Michael Niedermayer [Mon, 13 Jun 2011 02:25:36 +0000 (04:25 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
cmdutils: add missing NULL check in parse_options()
x11grab: remove a memory allocation and the associated memcpy.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 13 Jun 2011 01:30:56 +0000 (03:30 +0200)]
H264: Reduce pointless diffs to qatar
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 13 Jun 2011 01:00:53 +0000 (03:00 +0200)]
Revert "H264: Split out hl_motion and template it, this seems a bit faster"
This reverts commit
a50f0bea25a3da605cd547fe3bdfd36c8764b847 .
This has been implemented differently in qatar and its better they
maintain it for me instead of me having to spend an average 5sec more
per merge
Conflicts:
libavcodec/h264.c
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Sat, 11 Jun 2011 16:21:53 +0000 (18:21 +0200)]
libavfilter: implement avfilter_fill_frame_from_video_buffer_ref()
Stefano Sabatini [Sat, 11 Jun 2011 13:30:46 +0000 (15:30 +0200)]
avfiltergraph: make the AVFilterInOut alloc/free API public
This is required for letting applications to create and destroy
AVFilterInOut structs in a convenient way.
Stefano Sabatini [Sat, 11 Jun 2011 13:16:02 +0000 (15:16 +0200)]
avfiltergraph: change the syntax of avfilter_graph_parse()
Make it returns the list of open inputs and outputs, so it can be
reused by applications.
Breaks API/ABI.
Stefano Sabatini [Sat, 11 Jun 2011 12:33:09 +0000 (14:33 +0200)]
graphparser: prefer void * over AVClass * for log contexts
Alexander Strange [Thu, 2 Jun 2011 08:39:56 +0000 (01:39 -0700)]
h264: Complexify frame num gap shortening code
By observation it did not seem to handle prev_frame_num > frame_num.
This does not affect any files I have.
(cherry picked from commit
43c0092a80f8212cbb783260bafa157f7b85126e )
Alexander Strange [Thu, 2 Jun 2011 08:41:38 +0000 (01:41 -0700)]
Update todo
All the known bugs in h264 are fixed so I'm calling it done.
(cherry picked from commit
9cec36a6845c17e90a8d0c2cf9b03a00987c31f0 )
Michael Niedermayer [Sun, 12 Jun 2011 15:59:23 +0000 (17:59 +0200)]
mpeg12: replace 2 asserts by av_assert0
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Sun, 12 Jun 2011 11:54:22 +0000 (13:54 +0200)]
cmdutils: add missing NULL check in parse_options()
Fix ffplay -i FILE, which was recently broken.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Sven C. Dack [Wed, 30 Mar 2011 15:02:29 +0000 (17:02 +0200)]
x11grab: remove a memory allocation and the associated memcpy.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Michael Niedermayer [Sun, 12 Jun 2011 01:26:38 +0000 (03:26 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
build: fix "make install" with documentation disabled
build: simplify some conditional targets
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 11 Jun 2011 11:40:46 +0000 (13:40 +0200)]
Fix --disable-everything
Breakage was due to ff_find_pix_fmt() usage.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Mans Rullgard [Sat, 11 Jun 2011 18:54:23 +0000 (19:54 +0100)]
build: fix "make install" with documentation disabled
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Tue, 7 Jun 2011 09:11:21 +0000 (10:11 +0100)]
build: simplify some conditional targets
Use intermediate targets instead of variables for conditional
parts of "all" and "install" targets.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Clément Bœsch [Wed, 8 Jun 2011 09:26:43 +0000 (11:26 +0200)]
resample: clarify supported resampling.
This also fix a crash on 8ch → 2ch requested resampling.
Stefano Sabatini [Sat, 11 Jun 2011 09:41:49 +0000 (11:41 +0200)]
lavfi: fix signature for avfilter_graph_parse() and avfilter_graph_config()
Require "void *" rather than "AVClass *" for the log context type.
Stefano Sabatini [Sat, 11 Jun 2011 09:15:40 +0000 (11:15 +0200)]
avfiltergraph: use meaningful error codes
Michael Niedermayer [Sat, 11 Jun 2011 02:18:00 +0000 (04:18 +0200)]
Revert "ac3: there was no libav in 2010 thus this code cannot be from libav."
This reverts commit
7b8ec38d28cc99c4017471c6981fc1206732b468 .
The copyright date was wrong.
Michael Niedermayer [Sat, 11 Jun 2011 01:51:36 +0000 (03:51 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
bitstream: Properly promote av_reverse values before shifting.
libavutil/swscale: YUV444P10/YUV444P9 support.
H.264: Fix high bit depth explicit biweight
h264: Fix 10-bit H.264 x86 chroma v loopfilter asm.
Replace DEBUG_SEEK/DEBUG_SI + av_log combinations by av_dlog.
Update copyright year for ac3enc_opts_template.c.
adts: Adjust frame size mask to follow the specification.
movenc: Add RTP muxer/hinter options
movenc: Pass the RTP AVFormatContext to the SDP generation
rtspenc: Add RTP muxer options
rtspenc: Add an AVClass for setting muxer specific options
rtpenc_chain: Pass the rtpflags options through to the chained muxer
rtpenc: Declare the rtp flags private AVOptions in rtpenc.h
sdp: Reindent after the previous commit
rtpenc: MP4A-LATM payload support
avoptions: Add an av_opt_flag_is_set function for inspecting flag fields
sdp: Allow passing an AVFormatContext to the SDP generation
mov: Fix wrong timestamp generation for fragmented movies that have time offset caused by the first edit list entry.
mpeg12: more advanced ffmpeg mpeg2 aspect guessing code.
swscale: split YUYV output out of yuv2packed[12X]_c().
Conflicts:
doc/APIchanges
libavcodec/Makefile
libavcodec/h264dsp_template.c
libavcodec/mpeg12.c
libavformat/aacdec.c
libavformat/avidec.c
libavformat/internal.h
libavformat/movenc.c
libavformat/rtpenc.c
libavformat/rtpenc_latm.c
libavformat/sdp.c
libavformat/version.h
libavutil/avutil.h
libavutil/pixfmt.h
libswscale/swscale.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Etienne Buira [Fri, 10 Jun 2011 22:04:40 +0000 (00:04 +0200)]
Fix -t option for formats which holds dts and no pts
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Joseph Artsimovich [Fri, 10 Jun 2011 19:38:14 +0000 (21:38 +0200)]
dnxhd: Renama tables
Dave Badia [Fri, 10 Jun 2011 19:18:26 +0000 (21:18 +0200)]
Extract rotation in MOV metadata
Alex Converse [Tue, 26 Apr 2011 16:08:26 +0000 (09:08 -0700)]
bitstream: Properly promote av_reverse values before shifting.
Michael Niedermayer [Fri, 10 Jun 2011 18:25:49 +0000 (20:25 +0200)]
pixfmt: Replace 9/10bit deprecation by a technical explanation.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Ronald S. Bultje [Thu, 9 Jun 2011 02:16:39 +0000 (19:16 -0700)]
libavutil/swscale: YUV444P10/YUV444P9 support.
Also add missing glue code for recently added YUV422P10 formats
to swscale.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Jason Garrett-Glaser [Fri, 10 Jun 2011 01:20:19 +0000 (18:20 -0700)]
H.264: Fix high bit depth explicit biweight
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Oskar Arvidsson [Fri, 10 Jun 2011 00:40:10 +0000 (02:40 +0200)]
h264: Fix 10-bit H.264 x86 chroma v loopfilter asm.
The tc variable was not splatted correctly.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Diego Biurrun [Tue, 7 Jun 2011 11:18:12 +0000 (13:18 +0200)]
Replace DEBUG_SEEK/DEBUG_SI + av_log combinations by av_dlog.
Justin Ruggles [Fri, 10 Jun 2011 16:58:08 +0000 (12:58 -0400)]
Update copyright year for ac3enc_opts_template.c.
The code was originally committed to Libav on March 25, 2011.
Kieran Kunhya [Wed, 8 Jun 2011 06:26:20 +0000 (01:26 -0500)]
adts: Adjust frame size mask to follow the specification.
This fixes ADTS detection for at least one sample.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Stefano Sabatini [Fri, 10 Jun 2011 11:03:22 +0000 (13:03 +0200)]
APIchanges: fill hash for the avfilter_get_audio_buffer_ref_from_arrays addition
Mina Nagy Zaki [Wed, 8 Jun 2011 16:24:25 +0000 (19:24 +0300)]
lavfi: avfilter_merge_formats: handle case where inputs are same
This fixes a double-free crash if lists are the same due to the two
merge_ref() calls at the end of the (useless) merging that happens.
Stefano Sabatini [Sat, 12 Feb 2011 16:56:50 +0000 (17:56 +0100)]
lavfi: use avfilter_get_audio_buffer_ref_from_arrays() in defaults.c
Use avfilter_get_audio_buffer_ref_from_arrays() in
avfilter_default_get_audio_buffer(), simplify.
Stefano Sabatini [Sun, 30 Jan 2011 23:07:41 +0000 (00:07 +0100)]
lavfi: implement avfilter_get_audio_buffer_ref_from_arrays()
Stefano Sabatini [Fri, 10 Jun 2011 10:32:25 +0000 (12:32 +0200)]
APIchanges: remove duplicated entry
Stefano Sabatini [Fri, 10 Jun 2011 09:15:42 +0000 (11:15 +0200)]
APIchanges: fill in dates and numbers
Since some minor bump were not done, some entries present the same
libavutil minor (which represent the next bump after the corresponding
change).
Stefano Sabatini [Fri, 10 Jun 2011 09:50:55 +0000 (11:50 +0200)]
APIchanges: remove duplicated entry
Remove duplicated entry regarding PIX_FMT_BGR48LE/BE formats.
Stefano Sabatini [Fri, 10 Jun 2011 09:08:55 +0000 (11:08 +0200)]
APIchanges: correctly interleave entries
Stefano Sabatini [Fri, 10 Jun 2011 09:06:55 +0000 (11:06 +0200)]
APIchanges: add entry for av_force_cpu_flags() addition
Stefano Sabatini [Fri, 10 Jun 2011 09:54:54 +0000 (11:54 +0200)]
lavf: bump minor after the addition of fps_probe_size to AVFormatContext
Stefano Sabatini [Fri, 10 Jun 2011 09:24:04 +0000 (11:24 +0200)]
lavc: bump minor after the addition of AVCodecContext.request_sample_fmt
Martin Storsjö [Sat, 21 May 2011 11:58:43 +0000 (14:58 +0300)]
movenc: Add RTP muxer/hinter options
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Wed, 18 May 2011 12:41:38 +0000 (15:41 +0300)]
movenc: Pass the RTP AVFormatContext to the SDP generation
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Sat, 21 May 2011 12:03:48 +0000 (15:03 +0300)]
rtspenc: Add RTP muxer options
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Sat, 21 May 2011 12:03:35 +0000 (15:03 +0300)]
rtspenc: Add an AVClass for setting muxer specific options
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Wed, 18 May 2011 12:42:53 +0000 (15:42 +0300)]
rtpenc_chain: Pass the rtpflags options through to the chained muxer
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Fri, 27 May 2011 19:38:36 +0000 (22:38 +0300)]
rtpenc: Declare the rtp flags private AVOptions in rtpenc.h
This allows other muxers that chain a RTP muxer to declare
the same options easily.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Wed, 18 May 2011 12:48:20 +0000 (15:48 +0300)]
sdp: Reindent after the previous commit
Signed-off-by: Martin Storsjö <martin@martin.st>
Juan Carlos Rodriguez [Wed, 18 May 2011 12:00:03 +0000 (15:00 +0300)]
rtpenc: MP4A-LATM payload support
This is enabled with an AVOption on the RTP muxer. The SDP
generator looks for a latm flag in the rtpflags field.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Fri, 27 May 2011 19:21:40 +0000 (22:21 +0300)]
avoptions: Add an av_opt_flag_is_set function for inspecting flag fields
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Wed, 18 May 2011 12:41:06 +0000 (15:41 +0300)]
sdp: Allow passing an AVFormatContext to the SDP generation
Options from the AVFormatContext can be read for modifying
the generated SDP.
Signed-off-by: Martin Storsjö <martin@martin.st>
Yusuke Nakamura [Fri, 13 May 2011 14:46:48 +0000 (23:46 +0900)]
mov: Fix wrong timestamp generation for fragmented movies that have time offset caused by the first edit list entry.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Michael Niedermayer [Fri, 25 Mar 2011 00:13:08 +0000 (01:13 +0100)]
mpeg12: more advanced ffmpeg mpeg2 aspect guessing code.
Fixes issue1613, 621, 562 simultaneously
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Michael Niedermayer [Fri, 10 Jun 2011 02:54:30 +0000 (04:54 +0200)]
ac3: there was no libav in 2010 thus this code cannot be from libav.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 10 Jun 2011 01:54:27 +0000 (03:54 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lavf: make compute_pkt_fields2() return meaningful error values
matroskadec: set timestamps for RealAudio packets.
intelh263dec: aspect ratio processing fix.
intelh263dec: fix "Strict H.263 compliance" file playback
oss,sndio: simplify by using FFMIN.
swscale: extract monowhite/black output from yuv2packed[12X]_c().
swscale: de-macro'ify RGB15/16/32 input functions.
swscale: rearrange code.
movdec: Add support for the 'wfex' atom.
ffmpeg.c: Add a necessary const qualifier
riff: Fix potential memleak.
swscale: change 48bit RGB input macros to inline functions.
swscale: change 9/10bit YUV input macros to inline functions.
swscale: extract gray16 output functions from yuv2packed[12X]().
swscale: use standard clipping functions.
swscale: merge macros that are used only once.
swscale: fix function declarations in swscale.c.
swscale: fix function declaration keywords in x86/swscale_template.c.
Conflicts:
ffmpeg.c
libavcodec/intelh263dec.c
libswscale/swscale.c
libswscale/x86/swscale_template.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Ronald S. Bultje [Thu, 9 Jun 2011 22:13:53 +0000 (18:13 -0400)]
swscale: split YUYV output out of yuv2packed[12X]_c().
This is part of the Great Evil Plan to simplify swscale.
Michael Niedermayer [Thu, 9 Jun 2011 22:19:25 +0000 (00:19 +0200)]
dict: This code was developed in ffmpeg and not libav, nor by libav developers.
Correct copyright notices.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Tue, 15 Mar 2011 11:34:55 +0000 (12:34 +0100)]
lavf: make compute_pkt_fields2() return meaningful error values
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Reimar Döffinger [Sat, 26 Feb 2011 11:52:01 +0000 (12:52 +0100)]
matroskadec: set timestamps for RealAudio packets.
Improves seeking in ffplay with
http://samples.mplayerhq.hu/Matroska/RA_missing_timestamps.mkv
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Anton Khirnov [Thu, 9 Jun 2011 20:36:31 +0000 (22:36 +0200)]
intelh263dec: aspect ratio processing fix.
patch submitted by xvid_fan freenet de
Anton Khirnov [Thu, 9 Jun 2011 20:29:40 +0000 (22:29 +0200)]
intelh263dec: fix "Strict H.263 compliance" file playback
fixes issue2449
patch submitted by xvid_fan freenet de
Reimar Döffinger [Tue, 29 Mar 2011 18:18:45 +0000 (20:18 +0200)]
oss,sndio: simplify by using FFMIN.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Ronald S. Bultje [Thu, 9 Jun 2011 20:25:21 +0000 (16:25 -0400)]
swscale: extract monowhite/black output from yuv2packed[12X]_c().
This is part of the Great Evil Plan to simplify swscale.