]>
git.sesse.net Git - ffmpeg/log
Anton Khirnov [Tue, 30 Aug 2011 02:11:52 +0000 (04:11 +0200)]
ffmpeg: switch to a:b syntax
Anton Khirnov [Tue, 30 Aug 2011 02:10:54 +0000 (04:10 +0200)]
ffmpeg: replace -vcodec/-acodec/-scodec with a better system.
The new option doesn't depend on its placement wrt -new* options (which
don't exist anymore) and works in a similar way as per-stream AVOptions.
-[vas]codec remain as aliases to -codec:[vas]
Anton Khirnov [Tue, 30 Aug 2011 02:29:51 +0000 (04:29 +0200)]
ffmpeg: remove presets.
Nothing except x264 uses them and native x264 presets should be used
with private options.
Michael Niedermayer [Tue, 30 Aug 2011 02:06:57 +0000 (04:06 +0200)]
Revert "ffmpeg: simplify opt_*_codec() options"
This is needed because the following cherry picks are based on code prior of this
This reverts commit
f712f6c8a4bd14bae3c41118af642b5dae7f6e2b .
Anton Khirnov [Tue, 30 Aug 2011 02:06:24 +0000 (04:06 +0200)]
ffmpeg: change semantics of -map
New syntax contains an optional stream type, allowing to refer to n-th
stream of specific type.
Omitting stream number now maps all streams of the given type.
Anton Khirnov [Tue, 30 Aug 2011 02:05:20 +0000 (04:05 +0200)]
ffmpeg: get rid of new* options.
They are confusing, irregular and redundant -- -map already contains all
the information. Stream maps can now be parsed in opt_output_file().
Add a more user-friendly default behavior in case no maps are present.
Breaks -programid for now, but it never worked properly anyway. A better
solution will be written soon.
Anton Khirnov [Mon, 29 Aug 2011 23:46:34 +0000 (01:46 +0200)]
ffmpeg: rename sameq variables to same_quant
Anton Khirnov [Mon, 29 Aug 2011 23:30:11 +0000 (01:30 +0200)]
ffmpeg: make -map_metadata work consistently with the other options
Before, it took an input and output file index, now it only takes an
input file and applies to the next output file.
Stream/chapter/program specification is now part of the option name and
the delimiter was changed from ',' to ':' to be consistent with the
similar feature for AVOptions.
Anton Khirnov [Mon, 29 Aug 2011 23:28:08 +0000 (01:28 +0200)]
ffmpeg: make -map_chapters accept only the input file index.
This is consistent with how all the other options work
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 29 Aug 2011 23:20:08 +0000 (01:20 +0200)]
ffmpeg: Set codec_type in new_output_stream
Ported from a change from anton khirnov to avconv
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Anton Khirnov [Mon, 29 Aug 2011 23:11:54 +0000 (01:11 +0200)]
ffmpeg: rename ffmpeg_exit in exit_program
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Tue, 30 Aug 2011 08:35:29 +0000 (10:35 +0200)]
Only autodetect loas in transport streams.
The Makito encoder sets stream type 0x11 for AAC.
This patch should be reverted if it breaks decoding valid streams (and
the problem can't be fixed in the probe function).
Carl Eugen Hoyos [Tue, 30 Aug 2011 08:33:53 +0000 (10:33 +0200)]
Support Nellymoser in isom.
Carl Eugen Hoyos [Tue, 30 Aug 2011 08:31:14 +0000 (10:31 +0200)]
Disable cropping for the brainfart case.
This fixes ticket #348 for the few users who have a playback application
that supports Sisvel 3D. The other 99% have to wait until FFmpeg
supports arbitrary cropping.
Stefano Sabatini [Sat, 27 Aug 2011 23:30:04 +0000 (01:30 +0200)]
vsrc_testsrc: set more properties in the output frames
Stefano Sabatini [Sat, 13 Aug 2011 17:13:04 +0000 (19:13 +0200)]
fifo: add note in av_fifo_realloc2() doxy regarding reallocation failure behavior
Clément Bœsch [Sat, 27 Aug 2011 18:19:19 +0000 (20:19 +0200)]
ffprobe: introduce output format writers.
Baptiste Coudurier [Mon, 18 Jul 2011 08:13:37 +0000 (10:13 +0200)]
mov: read tmcd tag and set timecode drop flag accordingly.
Michael Niedermayer [Tue, 30 Aug 2011 03:41:44 +0000 (05:41 +0200)]
h264: allow debuging SEI types
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Mon, 29 Aug 2011 22:19:58 +0000 (00:19 +0200)]
Fix some APIchange versions.
Michael Niedermayer [Mon, 29 Aug 2011 20:24:01 +0000 (22:24 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
Revert "h264: Properly set coded_{width, height} when parsing H.264."
isom: add missing AVC-Intra tags, rearrange list and update comments
avconv: remove stubs of crop* and pad* options
avconv: re-add nb_streams to InputFile.
Conflicts:
avconv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 29 Aug 2011 18:51:31 +0000 (20:51 +0200)]
avfilter_graph_queue_command: Allow queueing commands out of order
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 29 Aug 2011 18:35:03 +0000 (20:35 +0200)]
avfilter: fix processing multiple commands per frame and filter
Found-by: Nicolas George
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 28 Aug 2011 22:07:30 +0000 (00:07 +0200)]
ffmpeg: Support queing filter commands for later times
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 28 Aug 2011 22:06:16 +0000 (00:06 +0200)]
avfilter: Add avfilter_graph_que_command()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 28 Aug 2011 18:47:33 +0000 (20:47 +0200)]
drawtext: Support changing parameters through reinit command at runtime.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 28 Aug 2011 18:47:06 +0000 (20:47 +0200)]
ffmpeg: Support passing commands to filters at runtime
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 28 Aug 2011 18:46:31 +0000 (20:46 +0200)]
avfilter: Add command passing support
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Luca Barbato [Sun, 21 Aug 2011 16:27:44 +0000 (18:27 +0200)]
Revert "h264: Properly set coded_{width, height} when parsing H.264."
This reverts commit
b47904d158709bdec1a9d40e83d1abadf50081dc .
coded_{width, height} overwrites width and height in avcodec_open and
it currently just report the non-lowres size.
Tomas Härdin [Mon, 29 Aug 2011 11:44:13 +0000 (13:44 +0200)]
isom: add missing AVC-Intra tags, rearrange list and update comments
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Anton Khirnov [Sun, 28 Aug 2011 16:51:45 +0000 (18:51 +0200)]
avconv: remove stubs of crop* and pad* options
Anton Khirnov [Sat, 13 Aug 2011 10:20:50 +0000 (12:20 +0200)]
avconv: re-add nb_streams to InputFile.
It was mistakenly removed in
2cf8355f98681bdd726b739008acd5483f82f8d7 ,
not taking into account that new streams might appear in av_read_frame()
that avconv doesn't know about.
Fixes bug 24.
Michael Niedermayer [Mon, 29 Aug 2011 02:34:35 +0000 (04:34 +0200)]
issue_tracker.txt: more updates toward trac
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 29 Aug 2011 02:32:04 +0000 (04:32 +0200)]
doc/issue_tracker.txt: regressions are important
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 29 Aug 2011 02:30:06 +0000 (04:30 +0200)]
doc/issue_tracker.txt: Update toward trac
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Sun, 28 Aug 2011 21:13:17 +0000 (23:13 +0200)]
Do not set codec_tag property for matroska muxers.
Fixes ticket #8.
Carl Eugen Hoyos [Sun, 28 Aug 2011 20:37:11 +0000 (22:37 +0200)]
Use the shorter channel layout description for the common case.
Carl Eugen Hoyos [Sun, 28 Aug 2011 19:43:04 +0000 (21:43 +0200)]
Do not assume timestamps for mp2 format.
Michael Niedermayer [Sat, 27 Aug 2011 22:14:40 +0000 (00:14 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
Use deinterleavers for demangling audio packets in RealMedia.
vf_scale: don't leak SWS context.
doxygen: drop another pointless star from pointer variable name
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Fredrik Axelsson [Sat, 13 Aug 2011 13:51:36 +0000 (22:51 +0900)]
Add support for BDAV/m2ts-mode muxing
Signed-off-by: Fredrik Axelsson <fraxbe@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Reimar Döffinger [Sat, 27 Aug 2011 19:54:17 +0000 (21:54 +0200)]
Replace goto by break, it has the same effect.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Reimar Döffinger [Sat, 27 Aug 2011 11:48:38 +0000 (13:48 +0200)]
vocdec: Take channel count into account when calculating bit rate.
Fixes trac issue #343.
Carl Eugen Hoyos actually made a patch first, but I missed it because
trac does not send notification emails when an attachment is added.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Reimar Döffinger [Sat, 27 Aug 2011 19:28:38 +0000 (21:28 +0200)]
JPEG-LS: clip offset based on cur_scan to valid range.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Marton Balint [Mon, 22 Aug 2011 21:42:19 +0000 (23:42 +0200)]
Rename find_program_from_stream to av_find_program_from_stream and add it to avformat.h
Also extend the functionality to use the last found program to start the search
after that program.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 27 Aug 2011 19:24:13 +0000 (21:24 +0200)]
Fix memory corruption in case of memory allocation failure in av_probe_input_buffer()
Reported-by: Tanami Ohad
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Kostya Shishkov [Sat, 13 Aug 2011 19:02:54 +0000 (21:02 +0200)]
Use deinterleavers for demangling audio packets in RealMedia.
Unlike other containers RealMedia stores its audio packets in scrambled form,
with interleaver ID preceeding audio codec ID. Currently deinterleaving
decision is tied to the codec while it's possible to have non-default
deinterleaver with audio codec (like Int0 deinterleaver instead of specific
one for Sipro).
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Michael Niedermayer [Wed, 9 Mar 2011 02:30:24 +0000 (03:30 +0100)]
vf_scale: don't leak SWS context.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Diego Biurrun [Sat, 27 Aug 2011 12:00:54 +0000 (14:00 +0200)]
doxygen: drop another pointless star from pointer variable name
Stefano Sabatini [Thu, 18 Aug 2011 12:26:15 +0000 (14:26 +0200)]
lavfi: add amovie source - audio movie source
Matthew Einhorn [Sat, 27 Aug 2011 01:49:29 +0000 (21:49 -0400)]
Removes the internal avcodec_find_best_pix_fmt1()function previously used by avcodec_find_best_pix_fmt() and not used anymore.
Signed-off-by: Matthew Einhorn <moiein2000@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 26 Aug 2011 23:49:55 +0000 (01:49 +0200)]
vf_scale: apply the same transform to the aspect during init that is applied per frame
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 26 Aug 2011 23:07:00 +0000 (01:07 +0200)]
imgconvert: make avcodec_find_best_pix_fmt2() more bug robust against future changes
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Matthew Einhorn [Fri, 26 Aug 2011 17:03:50 +0000 (13:03 -0400)]
Adds a new pix fmt function that selects the best dest fmt from among 2 formats to convert to, given a certain src format.
Similar to avcodec_find_best_pix_fmt(), but instead only compares two destination
pix fmts and selects one of these fmts as the best dest format when converting from
a given source format. Also, as opposed to avcodec_find_best_pix_fmt() which supports
only the first 64 defined pixel formats, this supports as input any of the defined
pixel formats.
Also replaces the old function to rely on the new function.
Signed-off-by: Matthew Einhorn <moiein2000@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 26 Aug 2011 21:18:54 +0000 (23:18 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
fifo: add FIFO API test program, and fate test
fifo: add av_fifo_peek2(), and deprecate av_fifo_peek()
postprocess.c: filter name needs to be double 0 terminated
doxygen: fix wrong comment syntax, //< vs. ///<
doxygen: drop pointless star from pointer variable names
Replace deprecated av_find_stream_info() by avformat_find_stream_info().
xmv: eliminate superfluous zeroing of zero data
configure: fix typo in avconv dependency list
Conflicts:
configure
doc/APIchanges
libavutil/Makefile
libavutil/avutil.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Sat, 16 Jul 2011 07:49:42 +0000 (09:49 +0200)]
fifo: add FIFO API test program, and fate test
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Stefano Sabatini [Wed, 29 Jun 2011 15:30:23 +0000 (17:30 +0200)]
fifo: add av_fifo_peek2(), and deprecate av_fifo_peek()
The new function provides a more generic interface than av_fifo_peek()
for peeking at a FIFO buffer data.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Piotr Kaczuba [Mon, 30 May 2011 11:19:35 +0000 (13:19 +0200)]
postprocess.c: filter name needs to be double 0 terminated
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
Diego Biurrun [Fri, 5 Aug 2011 11:15:04 +0000 (13:15 +0200)]
doxygen: fix wrong comment syntax, //< vs. ///<
Diego Biurrun [Mon, 8 Aug 2011 10:06:26 +0000 (12:06 +0200)]
doxygen: drop pointless star from pointer variable names
Diego Biurrun [Fri, 26 Aug 2011 15:40:07 +0000 (17:40 +0200)]
Replace deprecated av_find_stream_info() by avformat_find_stream_info().
Marton Balint [Thu, 25 Aug 2011 20:06:40 +0000 (22:06 +0200)]
ffplay: fix a crash caused by aborting the video queue
If the video queue is aborted, we have to pop the pending ALLOC event or wait
for the allocation to complete, because the current code assumes that
VideoState->pictq_windex does not change until the allocation is complete.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Sven Hesse [Thu, 18 Aug 2011 17:03:28 +0000 (19:03 +0200)]
xmv: eliminate superfluous zeroing of zero data
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Clément Bœsch [Wed, 17 Aug 2011 18:30:18 +0000 (20:30 +0200)]
ffprobe: fix deprecated call to av_find_stream_info.
Michael Niedermayer [Fri, 26 Aug 2011 12:01:30 +0000 (14:01 +0200)]
acodec: change default bitrate to 128k
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 26 Aug 2011 12:09:29 +0000 (14:09 +0200)]
regtests: use bitrate syntax understood by both tools
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Thu, 25 Aug 2011 19:47:47 +0000 (21:47 +0200)]
configure: fix typo in avconv dependency list
Michael Niedermayer [Thu, 25 Aug 2011 23:29:40 +0000 (01:29 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
vp6: partially propagate huffman tree building errors during coeff model parsing and fix misspelling
mpeg12: propagate chunk decode errors and fix conditional indentation
vc1: fix VC-1 Pulldown handling.
VC1: Fix first/last row checks with slices
mp4: Handle non-trivial ES Descriptors.
vc1: properly zero coded_block[] edges on new slice entry.
Conflicts:
libavcodec/vc1dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Dustin Brody [Tue, 16 Aug 2011 20:46:34 +0000 (16:46 -0400)]
vp6: partially propagate huffman tree building errors during coeff model parsing and fix misspelling
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Dustin Brody [Tue, 16 Aug 2011 15:35:04 +0000 (11:35 -0400)]
mpeg12: propagate chunk decode errors and fix conditional indentation
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Michael Niedermayer [Thu, 25 Aug 2011 19:43:30 +0000 (21:43 +0200)]
udp: fix circular buffer error handling
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
John Stebbins [Thu, 25 Aug 2011 19:36:13 +0000 (12:36 -0700)]
vc1: fix VC-1 Pulldown handling.
Pulldown flags are being set incorrectly and AVFrame->repeat_pict is not
being set. Also, skipped frames exit header parsing too early and do not
set pulldown flags appropriately. Ticks_per_frame needs to be set and
time_base adjusted so player can extend frame duration by a field time.
This fixes problems encountered when attempting to transcode HD-DVD EVOB
files with HandBrake. Also makes these files play smoothly in avplay.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Alberto Delmás [Thu, 25 Aug 2011 09:00:37 +0000 (11:00 +0200)]
VC1: Fix first/last row checks with slices
In some places 0/mb_height were used in place of start_mb_y/end_mb_y.
Fixes SA00049, SA00058, SA10091, SA10097, SA10131, SA20021, SA30030
Improves PSNR in SA00054, SA00059, SA00060, SA10096, SA10098, SA20022,
SA30031, SA30032, SA40012, SA40013
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Michael Niedermayer [Thu, 25 Aug 2011 19:33:54 +0000 (21:33 +0200)]
udp: buffer datagrams in circular buffer instead of a bytestream
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Alex Converse [Wed, 24 Aug 2011 23:59:30 +0000 (16:59 -0700)]
mp4: Handle non-trivial ES Descriptors.
Michael Niedermayer [Thu, 25 Aug 2011 11:54:43 +0000 (13:54 +0200)]
sws: use shift for chroma sample up convertion
sws: use shifts for non full range luma sample upconvertion
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Ronald S. Bultje [Wed, 24 Aug 2011 21:36:16 +0000 (14:36 -0700)]
vc1: properly zero coded_block[] edges on new slice entry.
Previously, we would leave the left edge uninitialized, which led to
CBP prediction errors on slice edges, e.g. in SA10098.vc1.
Marton Balint [Mon, 22 Aug 2011 20:26:53 +0000 (22:26 +0200)]
ffplay: use lock manager callback to make libavcodec thread-safe
Altough ffplay is working pretty well without using a lock manager, it is still
a multithreaded application calling libavcodec functions from multiple threads,
so using a lock manager is probably a good idea.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 24 Aug 2011 21:20:09 +0000 (23:20 +0200)]
oggdec: subtract time of first packet only from duration when it is significant
this fixes accuracy with normal ogg files while keeping support for ogg files
starting at times different from 0
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 24 Aug 2011 21:13:57 +0000 (23:13 +0200)]
oggdec: Make sure start time correction is applied once to each stream
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 24 Aug 2011 18:26:48 +0000 (20:26 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avconv: Replace goto redo on decode fail with continue.
avconv: Remove dead store.
libx264: add 'crf_max' private option.
libx264: add 'weightp' private option.
libx264: add 'rc_lookahead' private option.
libx264: add 'psy_trellis' private option.
libx264: add 'psy_rd' private option.
libx264: add 'aq_strength' private option.
libx264: add 'aq_mode' private option.
libx264: add 'cqp' private option.
libx264: add 'crf' private option.
lavc: remove vbv_delay option
lavf utils: Fix bad indentation.
avconv: use av_clip_int16 for audio clipping
Conflicts:
libavcodec/libx264.c
libavcodec/options.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Alex Converse [Tue, 23 Aug 2011 20:47:31 +0000 (13:47 -0700)]
avconv: Replace goto redo on decode fail with continue.
This checks for sigterm but otherwise is identical to the previous
behavior.
Alex Converse [Tue, 23 Aug 2011 21:30:11 +0000 (14:30 -0700)]
avconv: Remove dead store.
Michael Niedermayer [Wed, 24 Aug 2011 16:26:16 +0000 (18:26 +0200)]
h264-422: fix fate to handle 10 bit formats on big endian correctly.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 24 Aug 2011 15:57:40 +0000 (17:57 +0200)]
h264: Try to fix 422 intra NEON
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Anton Khirnov [Mon, 22 Aug 2011 05:55:34 +0000 (07:55 +0200)]
libx264: add 'crf_max' private option.
Deprecate corresponding global option.
Anton Khirnov [Mon, 22 Aug 2011 05:55:34 +0000 (07:55 +0200)]
libx264: add 'weightp' private option.
Deprecate corresponding global option.
Anton Khirnov [Mon, 22 Aug 2011 05:55:34 +0000 (07:55 +0200)]
libx264: add 'rc_lookahead' private option.
Deprecate corresponding global option.
Anton Khirnov [Mon, 22 Aug 2011 05:55:34 +0000 (07:55 +0200)]
libx264: add 'psy_trellis' private option.
Deprecate corresponding global option.
Anton Khirnov [Mon, 22 Aug 2011 05:55:34 +0000 (07:55 +0200)]
libx264: add 'psy_rd' private option.
Deprecate corresponding global option.
Anton Khirnov [Mon, 22 Aug 2011 05:55:34 +0000 (07:55 +0200)]
libx264: add 'aq_strength' private option.
Deprecate corresponding global option.
Anton Khirnov [Mon, 22 Aug 2011 05:55:34 +0000 (07:55 +0200)]
libx264: add 'aq_mode' private option.
Deprecate corresponding global option.
Anton Khirnov [Mon, 22 Aug 2011 05:55:34 +0000 (07:55 +0200)]
libx264: add 'cqp' private option.
Deprecate corresponding global option.
Anton Khirnov [Mon, 22 Aug 2011 05:55:34 +0000 (07:55 +0200)]
libx264: add 'crf' private option.
Deprecate corresponding global option.
Ideally all x264 private options should be generated automatically, but
x264 doesn't provide the API for this yet.
Anton Khirnov [Tue, 23 Aug 2011 15:28:33 +0000 (17:28 +0200)]
lavc: remove vbv_delay option
It's broken and serves no purpose as it's a read-only field.
Carl Eugen Hoyos [Tue, 23 Aug 2011 18:38:43 +0000 (20:38 +0200)]
Support decoding of 2bpp and 4bpp TIFF images.
Based on patches by Kostya and ami_stuff.
Alex Converse [Tue, 23 Aug 2011 01:47:24 +0000 (18:47 -0700)]
lavf utils: Fix bad indentation.
Alex Converse [Mon, 22 Aug 2011 17:38:35 +0000 (10:38 -0700)]
avconv: use av_clip_int16 for audio clipping
Michael Niedermayer [Tue, 23 Aug 2011 16:26:37 +0000 (18:26 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avconv: print the codecs names in the stream mapping.
avconv: move the avcodec_find_decoder() call to add_input_streams().
Windows Media Image decoder (WMVP/WVP2)
ac3enc: remove outdated TODO comment for apply_channel_coupling()
Conflicts:
Changelog
libavcodec/avcodec.h
libavcodec/vc1dec.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Nicolas George [Sat, 20 Aug 2011 10:40:26 +0000 (12:40 +0200)]
avconv: print the codecs names in the stream mapping.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Anton Khirnov [Mon, 22 Aug 2011 10:48:06 +0000 (12:48 +0200)]
avconv: move the avcodec_find_decoder() call to add_input_streams().
This makes the code simpler to understand, though it results in an
unnecessary call to avcodec_find_decoder() if the stream won't be
decoded.