ffmpeg.git
8 years agoMerge commit 'f593628e5868e52a46de666767896c6afcebdae4'
Michael Niedermayer [Tue, 30 Aug 2011 22:03:59 +0000 (00:03 +0200)]
Merge commit 'f593628e5868e52a46de666767896c6afcebdae4'

* commit 'f593628e5868e52a46de666767896c6afcebdae4':
  avconv: Replace raw picture frame swapping hack.
  RV40: reuse some H.264 motion compensation functions in RV40.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoSupport speex in avi.
Carl Eugen Hoyos [Tue, 30 Aug 2011 21:13:23 +0000 (23:13 +0200)]
Support speex in avi.

8 years agovf_drawtext: add basetime argument to allow specifying the wall clock time of PTS=0
Michael Niedermayer [Tue, 30 Aug 2011 21:37:49 +0000 (23:37 +0200)]
vf_drawtext: add basetime argument to allow specifying the wall clock time of PTS=0
the basetime argument also enables useage of pts instead of time()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agolibavfilter/graphparser: Avoid spaces in filter instance names.
Michael Niedermayer [Tue, 30 Aug 2011 20:02:38 +0000 (22:02 +0200)]
libavfilter/graphparser: Avoid spaces in filter instance names.
This makes it easier to refer to filters where things are seperated by spaces.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoffmpeg: ffmpeg: fix reading commands from the keyboard
Michael Niedermayer [Tue, 30 Aug 2011 19:56:40 +0000 (21:56 +0200)]
ffmpeg: ffmpeg: fix reading commands from the keyboard

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoffmpeg: fix reading commands from stdin
Michael Niedermayer [Tue, 30 Aug 2011 18:17:07 +0000 (20:17 +0200)]
ffmpeg: fix reading commands from stdin

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agovf_drawtext: fix segfault on reinit
Michael Niedermayer [Tue, 30 Aug 2011 17:47:23 +0000 (19:47 +0200)]
vf_drawtext: fix segfault on reinit

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoavconv: Replace raw picture frame swapping hack.
Alex Converse [Tue, 30 Aug 2011 02:28:42 +0000 (19:28 -0700)]
avconv: Replace raw picture frame swapping hack.

8 years agofate: Switch default tool to test from avconv to ffmpeg
Michael Niedermayer [Tue, 30 Aug 2011 16:16:03 +0000 (18:16 +0200)]
fate: Switch default tool to test from avconv to ffmpeg

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoffmpeg: re-add nb_streams to InputFile.
Anton Khirnov [Tue, 30 Aug 2011 14:43:11 +0000 (16:43 +0200)]
ffmpeg: 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.

8 years agoffmpeg: Replace goto redo on decode fail with continue.
Alex Converse [Tue, 30 Aug 2011 14:39:05 +0000 (16:39 +0200)]
ffmpeg: Replace goto redo on decode fail with continue.

This checks for sigterm but otherwise is identical to the previous
behavior.

8 years agoffmpeg: Remove dead store.
Alex Converse [Tue, 30 Aug 2011 14:38:38 +0000 (16:38 +0200)]
ffmpeg: Remove dead store.

8 years agoffmpeg: use av_clip_int16 for audio clipping
Alex Converse [Tue, 30 Aug 2011 14:38:09 +0000 (16:38 +0200)]
ffmpeg: use av_clip_int16 for audio clipping

8 years agoffmpeg: switch stream mapping print code to qatars variant
Michael Niedermayer [Tue, 30 Aug 2011 14:33:20 +0000 (16:33 +0200)]
ffmpeg: switch stream mapping print code to qatars variant

Author of the lines of code is probably Nicolas and or Anton
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoffmpeg: move the avcodec_find_decoder() call to add_input_streams().
Anton Khirnov [Tue, 30 Aug 2011 14:25:18 +0000 (16:25 +0200)]
ffmpeg: 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.

8 years agoffmpeg: Separate initialization from the main transcode loop.
Alex Converse [Tue, 30 Aug 2011 14:03:51 +0000 (16:03 +0200)]
ffmpeg: Separate initialization from the main transcode loop.

8 years agoffmpeg: reset input_ts_offset between files.
Anton Khirnov [Tue, 30 Aug 2011 14:01:20 +0000 (16:01 +0200)]
ffmpeg: reset input_ts_offset between files.

Signed-off-by: Alex Converse <alex.converse@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoffmpeg: call flush_encoders() from transcode() directly.
Anton Khirnov [Tue, 30 Aug 2011 14:00:47 +0000 (16:00 +0200)]
ffmpeg: call flush_encoders() from transcode() directly.

And remove now pointless parameter.

Signed-off-by: Alex Converse <alex.converse@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoffmpeg: fix broken indentation.
Anton Khirnov [Tue, 30 Aug 2011 13:59:56 +0000 (15:59 +0200)]
ffmpeg: fix broken indentation.

Signed-off-by: Alex Converse <alex.converse@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoffmpeg: rescue poor abused limit_filesize global.
Anton Khirnov [Tue, 30 Aug 2011 13:58:26 +0000 (15:58 +0200)]
ffmpeg: rescue poor abused limit_filesize global.

Keep a per-OutputFile instance of it, thus making -fs work with multiple
output files.

Signed-off-by: Alex Converse <alex.converse@gmail.com>
8 years agoffmpeg: Set error code before before jumping to fail.
Alex Converse [Tue, 30 Aug 2011 13:57:50 +0000 (15:57 +0200)]
ffmpeg: Set error code before before jumping to fail.

8 years agoffmpeg: Fix spelling errors.
Alex Converse [Tue, 30 Aug 2011 13:57:16 +0000 (15:57 +0200)]
ffmpeg: Fix spelling errors.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
8 years agoffmpeg: save two levels of indentation in flush_encoders()
Anton Khirnov [Tue, 30 Aug 2011 13:56:03 +0000 (15:56 +0200)]
ffmpeg: save two levels of indentation in flush_encoders()

By replacing
if (foo)
    <do stuff>

with
if (!foo)
    continue;
<do stuff>

8 years agoffmpeg: factor flushing encoders out of output_packet().
Anton Khirnov [Tue, 30 Aug 2011 13:55:25 +0000 (15:55 +0200)]
ffmpeg: factor flushing encoders out of output_packet().

8 years agoffmpeg: factor out initializing input streams.
Anton Khirnov [Tue, 30 Aug 2011 13:53:55 +0000 (15:53 +0200)]
ffmpeg: factor out initializing input streams.

8 years agoffmpeg: reset streamid_map between output files.
Anton Khirnov [Tue, 30 Aug 2011 13:46:55 +0000 (15:46 +0200)]
ffmpeg: reset streamid_map between output files.

8 years agoffmpeg: make timer_start a local var in transcode().
Anton Khirnov [Tue, 30 Aug 2011 13:46:24 +0000 (15:46 +0200)]
ffmpeg: make timer_start a local var in transcode().

8 years agoffmpeg: cosmetics, move OutputStream.
Anton Khirnov [Tue, 30 Aug 2011 13:44:47 +0000 (15:44 +0200)]
ffmpeg: cosmetics, move OutputStream.

Allows us to get rid of forward InputStream declaration.

8 years agoffmpeg: remove two unused macros.
Anton Khirnov [Tue, 30 Aug 2011 13:42:42 +0000 (15:42 +0200)]
ffmpeg: remove two unused macros.

8 years agoffmpeg: reindent.
Anton Khirnov [Tue, 30 Aug 2011 13:42:10 +0000 (15:42 +0200)]
ffmpeg: reindent.

8 years agoffmpeg: rescue poor abused start_time global.
Anton Khirnov [Tue, 30 Aug 2011 13:32:12 +0000 (15:32 +0200)]
ffmpeg: rescue poor abused start_time global.

Keep a per-OutputFile instance of it, thus making -ss work with multiple
output files.

8 years agoffmpeg: : rescue poor abused recording_time global.
Anton Khirnov [Tue, 30 Aug 2011 13:23:51 +0000 (15:23 +0200)]
ffmpeg: : rescue poor abused recording_time global.

Keep a per-OutputFile instance of it, thus making -t work with multiple
output files.

8 years agoffmpeg: fix broken indentation.
Anton Khirnov [Tue, 30 Aug 2011 13:08:39 +0000 (15:08 +0200)]
ffmpeg: fix broken indentation.

8 years agoffmpeg: get rid of the arbitrary MAX_FILES limit.
Anton Khirnov [Tue, 30 Aug 2011 13:08:02 +0000 (15:08 +0200)]
ffmpeg: get rid of the arbitrary MAX_FILES limit.

8 years agoffmpeg: get rid of the output_streams_for_file vs. ost_table schizophrenia
Anton Khirnov [Tue, 30 Aug 2011 13:03:53 +0000 (15:03 +0200)]
ffmpeg: get rid of the output_streams_for_file vs. ost_table schizophrenia

Instead store output streams in the same way as input streams.

8 years agoRevert "Fix stream mapping regression"
Michael Niedermayer [Tue, 30 Aug 2011 12:57:54 +0000 (14:57 +0200)]
Revert "Fix stream mapping regression"

Subsequent cherry picks are based on code prior to this, thus this needs to be rebased
on HEAD by a volunteer.
This reverts commit b25d931a82c7b95b2f47e6759c9d9be7705d664b.

8 years agoffmpeg: add a wrapper for output AVFormatContexts and merge output_opts into it
Anton Khirnov [Tue, 30 Aug 2011 12:19:39 +0000 (14:19 +0200)]
ffmpeg: add a wrapper for output AVFormatContexts and merge output_opts into it

8 years agoffmpeg: make itsscale syntax consistent with other options.
Anton Khirnov [Tue, 30 Aug 2011 12:16:53 +0000 (14:16 +0200)]
ffmpeg: make itsscale syntax consistent with other options.

Move the stream specifier to the option name.

8 years agoffmpeg: factor out adding input streams.
Anton Khirnov [Tue, 30 Aug 2011 12:07:49 +0000 (14:07 +0200)]
ffmpeg: factor out adding input streams.

8 years agoffmpeg: Factorize combining auto vsync with format.
Alex Converse [Tue, 30 Aug 2011 11:42:27 +0000 (13:42 +0200)]
ffmpeg: Factorize combining auto vsync with format.

8 years agoffmpeg: Factorize video resampling.
Alex Converse [Tue, 30 Aug 2011 02:51:52 +0000 (04:51 +0200)]
ffmpeg: Factorize video resampling.

8 years agoffmpeg: Don't unnecessarily convert ipts to a double.
Alex Converse [Tue, 30 Aug 2011 02:45:46 +0000 (04:45 +0200)]
ffmpeg: Don't unnecessarily convert ipts to a double.

8 years agoffmpeg: don't segfault on 0 input files.
Anton Khirnov [Tue, 30 Aug 2011 02:22:06 +0000 (04:22 +0200)]
ffmpeg: don't segfault on 0 input files.

8 years agoffmpeg: remove pointless parameter from new_*_stream().
Anton Khirnov [Tue, 30 Aug 2011 02:20:25 +0000 (04:20 +0200)]
ffmpeg: remove pointless parameter from new_*_stream().

New streams are always added to the last output file.

8 years agoffmpeg: cosmetics, move code
Anton Khirnov [Tue, 30 Aug 2011 02:19:26 +0000 (04:19 +0200)]
ffmpeg: cosmetics, move code

Move find_codec_or_die(), choose_codec(), new_output_stream() and
read_avserver_streams() below transcode() where they belong.

8 years agoffmpeg: cosmetics -- move copy_chapters().
Anton Khirnov [Tue, 30 Aug 2011 02:15:30 +0000 (04:15 +0200)]
ffmpeg: cosmetics -- move copy_chapters().

It's only used in opt_output_file(), so move it right above
opt_output_file().

8 years agoffmpeg: cosmetics -- move parse_forced_key_frames().
Anton Khirnov [Tue, 30 Aug 2011 02:14:12 +0000 (04:14 +0200)]
ffmpeg: cosmetics -- move parse_forced_key_frames().

parse_forced_key_frames() is only used in new_video_stream(), so move it
right above new_video_stream().

8 years agoffmpeg: switch to a:b syntax
Anton Khirnov [Tue, 30 Aug 2011 02:11:52 +0000 (04:11 +0200)]
ffmpeg: switch to a:b syntax

8 years agoffmpeg: replace -vcodec/-acodec/-scodec with a better system.
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]

8 years agoffmpeg: remove presets.
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.

8 years agoRevert "ffmpeg: simplify opt_*_codec() 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.

8 years agoffmpeg: change semantics of -map
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.

8 years agoffmpeg: get rid of new* options.
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.

8 years agoffmpeg: rename sameq variables to same_quant
Anton Khirnov [Mon, 29 Aug 2011 23:46:34 +0000 (01:46 +0200)]
ffmpeg: rename sameq variables to same_quant

8 years agoffmpeg: make -map_metadata work consistently with the other options
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.

8 years agoffmpeg: make -map_chapters accept only the input file index.
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>
8 years agoffmpeg: Set codec_type in new_output_stream
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>
8 years agoffmpeg: rename ffmpeg_exit in exit_program
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>
8 years agoRV40: reuse some H.264 motion compensation functions in RV40.
Kostya Shishkov [Tue, 30 Aug 2011 09:02:22 +0000 (10:02 +0100)]
RV40: reuse some H.264 motion compensation functions in RV40.

Since RV40 is based on H.264, it uses the same interpolation filters and
functions for halfpel interpolation in one direction can be reused.
Unfortunately other cases are implemented differently and produce slightly
different output because of rounding.

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agoOnly autodetect loas in transport streams.
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).

8 years agoSupport Nellymoser in isom.
Carl Eugen Hoyos [Tue, 30 Aug 2011 08:33:53 +0000 (10:33 +0200)]
Support Nellymoser in isom.

8 years agoDisable cropping for the brainfart case.
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.

8 years agovsrc_testsrc: set more properties in the output frames
Stefano Sabatini [Sat, 27 Aug 2011 23:30:04 +0000 (01:30 +0200)]
vsrc_testsrc: set more properties in the output frames

8 years agofifo: add note in av_fifo_realloc2() doxy regarding reallocation failure behavior
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

8 years agoffprobe: introduce output format writers.
Clément Bœsch [Sat, 27 Aug 2011 18:19:19 +0000 (20:19 +0200)]
ffprobe: introduce output format writers.

8 years agomov: read tmcd tag and set timecode drop flag accordingly.
Baptiste Coudurier [Mon, 18 Jul 2011 08:13:37 +0000 (10:13 +0200)]
mov: read tmcd tag and set timecode drop flag accordingly.

8 years agoh264: allow debuging SEI types
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>
8 years agoFix some APIchange versions.
Carl Eugen Hoyos [Mon, 29 Aug 2011 22:19:58 +0000 (00:19 +0200)]
Fix some APIchange versions.

8 years agoMerge remote-tracking branch 'qatar/master'
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>
8 years agoavfilter_graph_queue_command: Allow queueing commands out of order
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>
8 years agoavfilter: fix processing multiple commands per frame and filter
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>
8 years agoffmpeg: Support queing filter commands for later times
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>
8 years agoavfilter: Add avfilter_graph_que_command()
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>
8 years agodrawtext: Support changing parameters through reinit command at runtime.
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>
8 years agoffmpeg: Support passing commands to filters at runtime
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>
8 years agoavfilter: Add command passing support
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>
8 years agoRevert "h264: Properly set coded_{width, height} when parsing H.264."
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.

8 years agoisom: add missing AVC-Intra tags, rearrange list and update comments
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>
8 years agoavconv: remove stubs of crop* and pad* options
Anton Khirnov [Sun, 28 Aug 2011 16:51:45 +0000 (18:51 +0200)]
avconv: remove stubs of crop* and pad* options

8 years agoavconv: re-add nb_streams to InputFile.
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.

8 years agoissue_tracker.txt: more updates toward trac
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>
8 years agodoc/issue_tracker.txt: regressions are important
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>
8 years agodoc/issue_tracker.txt: Update toward trac
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>
8 years agoDo not set codec_tag property for matroska muxers.
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.

8 years agoUse the shorter channel layout description for the common case.
Carl Eugen Hoyos [Sun, 28 Aug 2011 20:37:11 +0000 (22:37 +0200)]
Use the shorter channel layout description for the common case.

8 years agoDo not assume timestamps for mp2 format.
Carl Eugen Hoyos [Sun, 28 Aug 2011 19:43:04 +0000 (21:43 +0200)]
Do not assume timestamps for mp2 format.

8 years agoMerge remote-tracking branch 'qatar/master'
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>
8 years agoAdd support for BDAV/m2ts-mode muxing
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>
8 years agoReplace goto by break, it has the same effect.
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>
8 years agovocdec: Take channel count into account when calculating bit rate.
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>
8 years agoJPEG-LS: clip offset based on cur_scan to valid range.
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>
8 years agoRename find_program_from_stream to av_find_program_from_stream and add it to avformat.h
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>
8 years agoFix memory corruption in case of memory allocation failure in av_probe_input_buffer()
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>
8 years agoUse deinterleavers for demangling audio packets in RealMedia.
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>
8 years agovf_scale: don't leak SWS context.
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>
8 years agodoxygen: drop another pointless star from pointer variable name
Diego Biurrun [Sat, 27 Aug 2011 12:00:54 +0000 (14:00 +0200)]
doxygen: drop another pointless star from pointer variable name

8 years agolavfi: add amovie source - audio movie source
Stefano Sabatini [Thu, 18 Aug 2011 12:26:15 +0000 (14:26 +0200)]
lavfi: add amovie source - audio movie source

8 years agoRemoves the internal avcodec_find_best_pix_fmt1()function previously used by avcodec_...
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>
8 years agovf_scale: apply the same transform to the aspect during init that is applied per...
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>
8 years agoimgconvert: make avcodec_find_best_pix_fmt2() more bug robust against future changes
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>