Statistics
| Branch: | Revision:

ffmpeg / ffmpeg.c @ 0ae2a036

History | View | Annotate | Download (163 KB)

# Date Author Comment
5381823e 04/10/2011 10:14 PM Stefano Sabatini

ffmpeg: rename configure_filters() to configure_video_filters()

Mostly useful for the audio-filters branch, to make more apparent the
distinction between configure_audio_filters() and
configure_video_filters().

Signed-off-by: Stefano Sabatini <>

d4d09329 04/09/2011 01:17 AM Michael Niedermayer

Merge remote branch 'qatar/master'

  • qatar/master:
    lavf: bump minor and add an APIChanges entry for avformat cleanup
    lavf: get rid of ffm-specific stuff in avformat.h
    Not pulled: avio: deprecate av_protocol_next().
    avio: add a function for iterating though protocol names....
3ee53dab 04/08/2011 06:58 PM Anton Khirnov

lavf: get rid of ffm-specific stuff in avformat.h

c3675dfe 04/08/2011 02:45 PM Anton Khirnov

lavf: rename avf_sdp_create to av_sdp_create.

The new name is more consistent with the rest of the API.

c88caa52 04/08/2011 12:50 AM Michael Niedermayer

Merge remote branch 'qatar/master'

  • qatar/master:
    proto: include os_support.h in network.h
    matroskaenc: don't write an empty Cues element.
    lavc: add a FF_API_REQUEST_CHANNELS deprecation macro
    avio: move extern url_interrupt_cb declaration from avio.h to url.h...
80c6e238 04/07/2011 04:11 PM Anton Khirnov

avio: avio_ prefix for url_set_interrupt_cb.

f87b1b37 04/07/2011 04:07 PM Anton Khirnov

avio: AVIO_ prefixes for URL_ open flags.

6b1c886b 04/06/2011 09:21 PM Michael Niedermayer

Fix ticket20
Signed-off-by: Michael Niedermayer <>

d6c85865 04/06/2011 01:01 AM Michael Niedermayer

Revert "ffmpeg: fix aspect ratio setting"

This reverts commit d1eb50bb29caad9745631759265f475177df99b9.
Reason, it breaks fate

11d78415 04/06/2011 12:59 AM Michael Niedermayer

Merge remote branch 'qatar/master'

  • qatar/master:
    psymodel: extend API to include PE and bit allocation.
    avio: always compile dyn_buf functions
    Remove unnecessary parameter from ff_thread_init() and fix behavior
    Revert "aac_latm_dec: use aac context and aac m4ac"...
b5ef6f8e 04/05/2011 11:09 PM Michael Niedermayer

Fix crash in ffmpeg.c with PIX_FMT_NONE
Signed-off-by: Michael Niedermayer <>

d1eb50bb 04/05/2011 01:33 PM Stefano Sabatini

ffmpeg: fix aspect ratio setting

This is done by adding a setsar filter at the beginning of the
configured filterchain.

This implementation is more robust, since does not modify the
filterchain description (which was creating potential syntax errors),
but directly modifies the filterchain structure....

14cf0fd2 04/05/2011 07:08 AM Alex Converse

Add silence support for AV_SAMPLE_FMT_U8.

Signed-off-by: Anton Khirnov <>

8af3167b 04/05/2011 01:21 AM Lou Logan

Redefine sameq

I think the documentation of sameq is causing confusion and misuse of
this option.

Signed-off-by: Michael Niedermayer <>

100a6b7c 04/03/2011 10:35 PM Peter Ross

ffmpeg: make 'bits_per_raw_sample' option more useful

Currently bits_per_raw_sample is exposed as an AVCodecContext option.
The option is not very useful, because ffmpeg 1) overwrites it with
a value from the upstream codec, or 2) it resets the value whenever...

7d948dc4 04/03/2011 02:40 PM Michael Niedermayer

Support changing pixel formats on avfilter input.
Fix issue2217
Signed-off-by: Michael Niedermayer <>

b25d931a 04/02/2011 02:15 PM Michael Niedermayer

Fix stream mapping regression

Signed-off-by: Michael Niedermayer <>

e7c7b0d0 04/01/2011 03:38 PM Michael Niedermayer

Another aspect ratio fix try. This leaves the setdar addition at the end (preferred by people).

Signed-off-by: Michael Niedermayer <>

6408529b 04/01/2011 12:11 PM Peter Ross

Increase ffmpeg video encoding buffer size to permit encoding of DPX images

The header generated by the DPX encoder is 1664 bytes.

859676dd 04/01/2011 12:14 AM Michael Niedermayer

Insert setdar at the begin of a filter chain instead the end.
This fixes -vf setsar

Signed-off-by: Michael Niedermayer <>

8b8bf89e 03/30/2011 10:22 PM Michael Niedermayer

Revert "Do no modify terminal parameters using termios.h"

This reverts commit cb48e245e6e770f146220fac0a8bd4dc1a5e006c.

Reason being we like pressing "q" to quit ffmpeg.

Conflicts:

ffmpeg.c

Signed-off-by: Michael Niedermayer <>

2ee85c06 03/27/2011 01:53 PM Stefano Sabatini

ffmpeg: warns the user when the selected pixel format is ignored

0c55c6d3 03/26/2011 01:40 PM Stefano Sabatini

cmdutils: remove list_fmts(), simplify

The function was only used in opt_sample_fmt() for listing the sample
formats. Move list_fmts() functionality directly into
opt_sample_fmt().

Als fix the warning:
ffmpeg.c: In function ‘opt_audio_sample_fmt’:
ffmpeg.c:2877: warning: passing argument 1 of ‘list_fmts’ from incompatible pointer type...

27ef7b1b 03/26/2011 02:06 AM Michael Niedermayer

Merge remote-tracking branch 'newdev/master'

  • newdev/master:
    mov: set audio service type for AC-3 from bitstream mode in the 'dac3' atom.
    Get audio_service_type for AC-3 based on bitstream mode in the AC-3 parser and decoder, and vice-versa for the AC-3 encoder....
34b47d7c 03/25/2011 08:51 PM Justin Ruggles

Add audio_service_type field to AVCodecContext for encoding and reporting
of the service type in the audio bitstream.

4ffc79e7 03/25/2011 05:42 PM Stefano Sabatini

ffmpeg: include conditionally the sws_flags variable

The variable is not used when libavfilter is enabled.
Fix the warning:
ffmpeg.c: At top level:
ffmpeg.c:242: warning: ‘sws_flags’ defined but not used

6dfb4ab8 03/25/2011 01:26 AM Michael Niedermayer

Make multiple Ctrl-C capable to kill stuck protocols.
Signed-off-by: Michael Niedermayer <>

4fa0e247 03/23/2011 01:42 AM Michael Niedermayer

Merge remote-tracking branch 'newdev/master'

  • newdev/master: (33 commits)
    Fix an infinite loop when RoQ encoded generated a frame with a size greater than the maximum valid size.
    Add kbdwin.o to AC3 decoder
    Detect byte-swapped AC-3 and support decoding it directly....
b58b9fa3 03/22/2011 11:07 AM Dave Yeo

Make sure kbhit() is in conio.h

Conio.h is a non-standard header and may not have kbhit()
prototyped. This fixes compile on OS/2 where the EMX version (we're
using a fork) of conio.h only has getch() and getche().

Signed-off-by: Mans Rullgard <>

d4a50a21 03/21/2011 02:33 AM Michael Niedermayer

Merge remote-tracking branch 'newdev/master'

Merged-by: Michael Niedermayer <>

cb48e245 03/20/2011 09:13 PM Panagiotis H.M. Issaris

Do no modify terminal parameters using termios.h

Remove usage of tcgetattr and tcsetattr to modify terminal
parameters, and rely on ctrl-c to stop instead of pressing 'q'.
On systems with conio.h, keep the old behavior.

Changing the terminal settings causes problems if multiple instances...

17a4ec8e 03/20/2011 08:07 PM Stefano Sabatini

ffmpeg: modify help text for the map option

Change "file:stream[:syncfile:syncstream]" to
"file.stream[:syncfile.syncstream]", the latter syntax is more
consistent with the stream identifier form printed by
av_dump_format(), and more readable. Both syntaxes are currently...

2912e87a 03/19/2011 01:33 PM Mans Rullgard

Replace FFmpeg with Libav in licence headers

Signed-off-by: Mans Rullgard <>

a7844c58 03/17/2011 12:35 AM Thierry Foucu

Fix compilation error when CONFIG_AVFILTER is not defined.

Signed-off-by: Michael Niedermayer <>

27efa296 03/12/2011 04:55 PM Michael Niedermayer

Merge branch 'master' of git://git.ffmpeg.org/ffmpeg

Merged-by: Michael Niedermayer <>

5dbe78bf 03/12/2011 02:08 PM Stefano Sabatini

ffmpeg: remove unused variable in ffmpeg_exit()

Fix the warning:
ffmpeg.c: In function ‘ffmpeg_exit’:
ffmpeg.c:509: warning: unused variable ‘j’

Signed-off-by: Mans Rullgard <>

0de8ebf4 03/08/2011 07:45 PM Carl Eugen Hoyos

Do not use AVFMT_FLAG_NONBLOCK for the output file.

Allows to use output device alsa.

db44ea96 03/08/2011 01:09 AM Anton Khirnov

avio: avio_ prefix for url_fsize

Signed-off-by: Ronald S. Bultje <>
(cherry picked from commit 76aa876e69cf78a40821e66dec0a1006e4eb23ec)

8993b596 03/07/2011 04:25 PM Michael Niedermayer

Make sure the first q press doesnt f*ck up the protocols and thus written files.
Signed-off-by: Michael Niedermayer <>

90552407 03/07/2011 04:23 PM Michael Niedermayer

Fix seting of decode_interrupt_cb()
Signed-off-by: Michael Niedermayer <>

76aa876e 03/07/2011 04:03 PM Anton Khirnov

avio: avio_ prefix for url_fsize

Signed-off-by: Ronald S. Bultje <>

384c9c2f 03/05/2011 01:29 AM Anton Khirnov

avio: add avio_tell macro as a replacement for url_ftell

Signed-off-by: Ronald S. Bultje <>
(cherry picked from commit a2704c9712ad35cc22e7e0d8a79b581c07fa383b)

a2704c97 03/04/2011 04:26 PM Anton Khirnov

avio: add avio_tell macro as a replacement for url_ftell

Signed-off-by: Ronald S. Bultje <>

d34ffd3c 03/03/2011 01:15 PM Martin Storsjö

ffmpeg: Use av_pkt_dump_log2

This makes dumped packet timestamps proper for streams with
timebases other than AV_TIME_BASE.

Signed-off-by: Luca Barbato <>
(cherry picked from commit 5e33e7bdac70a4b70e31f4ae6f0344060346d0b8)

5e33e7bd 03/02/2011 10:29 AM Martin Storsjö

ffmpeg: Use av_pkt_dump_log2

This makes dumped packet timestamps proper for streams with
timebases other than AV_TIME_BASE.

Signed-off-by: Luca Barbato <>

ebb92e07 02/23/2011 05:22 PM Anton Khirnov

avio: rename url_fopen/fclose -> avio_open/close.

Signed-off-by: Ronald S. Bultje <>
(cherry picked from commit 22a3212e32b696028e21f00871f3cb48c044029d)

22a3212e 02/23/2011 03:18 PM Anton Khirnov

avio: rename url_fopen/fclose -> avio_open/close.

Signed-off-by: Ronald S. Bultje <>

5c20c81b 02/19/2011 04:31 PM Michael Niedermayer

Fix issue2619.
regression introduced in 1762d9ced70ccc46c5d3e5d64e56a48d0fbbd4f7

Signed-off-by: Michael Niedermayer <>

0ebf4754 02/18/2011 06:52 PM Anton Khirnov

lavf: add av_ prefix to dump_format()

Signed-off-by: Mans Rullgard <>
(cherry picked from commit 610219a598095f938705f200dfe3946455ef871a)

610219a5 02/16/2011 11:39 PM Anton Khirnov

lavf: add av_ prefix to dump_format()

Signed-off-by: Mans Rullgard <>

7ffe76e5 02/16/2011 10:00 PM Reinhard Tartler

Merge libavcore into libavutil

Done to keep ABI compatible. Otherwise this is just silly

737eb597 02/15/2011 03:18 PM Reinhard Tartler

Merge libavcore into libavutil

It is pretty hopeless that other considerable projects will adopt
libavutil alone in other projects. Projects that need small footprint
are better off with more specialized libraries such as gnulib or rather
just copy the necessary parts that they need. With this in mind, nobody...

1762d9ce 02/14/2011 10:03 PM Michael Niedermayer

Restructure video filter implemenattion in ffmpeg.c.
This fixes several bugs like multiple outputs and -aspect mixed with -vf

Signed-off-by: Michael Niedermayer <>

043d2ff2 02/11/2011 01:54 AM Alexander Strange

Deprecate avcodec_thread_init()

As a side effect of the last commit, avcodec_open() now calls it automatically,
so there is no longer any need for clients to call it.
Instead they should set AVCodecContext.thread_count.

avcodec_thread_free() is deprecated, and will be removed from avcodec.h at the...

c0b102ca 02/09/2011 02:17 PM Alexander Strange

Deprecate avcodec_thread_init()

As a side effect of the last commit, avcodec_open() now calls it automatically,
so there is no longer any need for clients to call it.
Instead they should set AVCodecContext.thread_count.

avcodec_thread_free() is deprecated, and will be removed from avcodec.h at the...

76ad67ca 02/07/2011 06:32 PM Nicolas George

Implement guessed_pts in avcodec_decode_video2

Signed-off-by: Nicolas George <>
Signed-off-by: Michael Niedermayer <>

ba3517aa 02/06/2011 07:31 PM James Zern

cmdutils: fix opt_values leak

Add free to uninit_opts and relocate opt_names to same

Signed-off-by: Ronald S. Bultje <>
(cherry picked from commit 3a6a9cdf5b8e4c4514e483484ef1f57b07ee16f2)

fd0ae17a 02/06/2011 07:31 PM Alexander Strange

Adopt pkt_dts/pkt_pts in lavc clients

No behavior change; this makes DTS reliable with the next patch.

Signed-off-by: Ronald S. Bultje <>
(cherry picked from commit 6b474953975fd8ea64d1ed4d09c42b2d8e787c6f)

42f97696 02/06/2011 07:31 PM Martin Storsjö

Use avformat_free_context for cleaning up muxers

Signed-off-by: Ronald S. Bultje <>
(cherry picked from commit b22dbb291d41e9fb038884bcebad2394c501cbaf)

ab543afe 02/06/2011 07:31 PM Stefano Sabatini

Make avfilter_graph_free() free the graph.

Make avfilter_graph_free() free not only the internal structures, but
also the allocated graph, and set the graph pointer to NULL for
increased safety.

Simplify usage.

Signed-off-by: Mans Rullgard <>...

3a6a9cdf 02/05/2011 10:18 PM James Zern

cmdutils: fix opt_values leak

Add free to uninit_opts and relocate opt_names to same

Signed-off-by: Ronald S. Bultje <>

6b474953 02/05/2011 09:37 PM Alexander Strange

Adopt pkt_dts/pkt_pts in lavc clients

No behavior change; this makes DTS reliable with the next patch.

Signed-off-by: Ronald S. Bultje <>

b22dbb29 02/04/2011 04:39 PM Martin Storsjö

Use avformat_free_context for cleaning up muxers

Signed-off-by: Ronald S. Bultje <>

4359288c 02/04/2011 02:55 AM Stefano Sabatini

Make avfilter_graph_free() free the graph.

Make avfilter_graph_free() free not only the internal structures, but
also the allocated graph, and set the graph pointer to NULL for
increased safety.

Simplify usage.

Signed-off-by: Mans Rullgard <>

4a908866 02/04/2011 02:10 AM Anton Khirnov

ffmpeg.c: rename map_meta_data option to map_metadata

It's consistent with the -metadata option and easier to write.

Signed-off-by: Janne Grunau <>
(cherry picked from commit 87e4d9b252bc6fa3b982f7050013069c9dc3e05b)

87e4d9b2 02/02/2011 09:44 PM Anton Khirnov

ffmpeg.c: rename map_meta_data option to map_metadata

It's consistent with the -metadata option and easier to write.

Signed-off-by: Janne Grunau <>

7b3ea550 01/31/2011 08:32 PM Michael Niedermayer

Add sample_aspect_ratio fields to vsrc_buffer arguments.
This fixes aspect handling in ffmpeg
This is based on a patch by baptiste

5a8d1075 01/31/2011 05:25 PM Stefano Sabatini

Make ffmpeg warns the user when the selected sample format is ignored.

Signed-off-by: Mans Rullgard <>
(cherry picked from commit fa34a3626cf1aa19acbe9f8c6fcddb6c3eb8eaa1)

fa34a362 01/31/2011 12:55 PM Stefano Sabatini

Make ffmpeg warns the user when the selected sample format is ignored.

Signed-off-by: Mans Rullgard <>

41727b85 01/26/2011 02:43 AM Diego Elio Pettenò

Make local variables static.

Signed-off-by: Mans Rullgard <>
(cherry picked from commit a6d1bd05c906fc7ad34fae1029a45ec3cbcc4fcc)

0f16f725 01/26/2011 02:43 AM Stefano Sabatini

Do not set audio_resample to 0 if audio_sync_method is > 1.

If audio_sync_method is >1 the resampler is used for audio drift
compensation, and do_audio_out() was causing an assert failure because
audio_resample was not set.

Fix issue 2516, which was introduced by SVN r25939....

a6d1bd05 01/25/2011 12:02 AM Diego Elio Pettenò

Make local variables static.

Signed-off-by: Mans Rullgard <>

07b48f8c 01/24/2011 05:30 PM Stefano Sabatini

Do not set audio_resample to 0 if audio_sync_method is > 1.

If audio_sync_method is >1 the resampler is used for audio drift
compensation, and do_audio_out() was causing an assert failure because
audio_resample was not set.

Fix issue 2516, which was introduced by SVN r25939....

ba0dd9e8 01/23/2011 06:32 PM Mike Scheutzow

streamid does not work with newaudio, newvideo, newsubtitle

fixes issue2465.

The problem is that the ffmpeg (the app) -streamid option did not work
with -newaudio/-newvideo/-newsubtitle.

The cause was a conflict between the feature where streamid values were...

20ac9de3 01/22/2011 03:10 AM Mike Scheutzow

streamid does not work with newaudio, newvideo, newsubtitle

fixes issue2465.

The problem is that the ffmpeg (the app) -streamid option did not work
with -newaudio/-newvideo/-newsubtitle.

The cause was a conflict between the feature where streamid values were...

59e2118e 01/18/2011 03:04 PM Michael Niedermayer

Update threshold to detect real timebase for stream copy.
This may fix a bug where quicktime files use 1/600 timebase.

d9c3e5f6 01/17/2011 10:22 PM Michael Niedermayer

Feed the filter chain with the sample aspect ratio from the muxer or codec layer
like it has been done prior libavfilter.

0f27e6b4 01/14/2011 10:01 PM Baptiste Coudurier

New "copytb" ffmpeg cli option to copy input stream time base when stream copying.
This should avoid non monotone timestamps for video streams with vfr.

Originally committed as revision 26340 to svn://svn.ffmpeg.org/ffmpeg/trunk

6c18f1cd 01/14/2011 08:58 PM Stefano Sabatini

Make opt_audio_sample_fmt() abort in case of invalid sample format
name.

Originally committed as revision 26335 to svn://svn.ffmpeg.org/ffmpeg/trunk

8e8a3cc2 01/14/2011 07:31 PM Ronald S. Bultje

Reindent after 26330.

Originally committed as revision 26331 to svn://svn.ffmpeg.org/ffmpeg/trunk

7f88a5bf 01/14/2011 07:30 PM Ronald S. Bultje

Introduce av_metadata_copy() to copy metadata from one struct to another.

Originally committed as revision 26330 to svn://svn.ffmpeg.org/ffmpeg/trunk

8a774d3d 01/12/2011 12:52 AM Baptiste Coudurier

Do not allocate unused swscale context when libavfilter is compiled in

Originally committed as revision 26317 to svn://svn.ffmpeg.org/ffmpeg/trunk

4618637a 01/11/2011 09:16 PM Baptiste Coudurier

Fix warnings:
ffmpeg.c: In function ‘new_video_stream’:
ffmpeg.c:3701:18: warning: ‘codec_id’ may be used uninitialized in this function
ffmpeg.c: In function ‘new_audio_stream’:
ffmpeg.c:3848:18: warning: ‘codec_id’ may be used uninitialized in this function...

c961fb3c 01/11/2011 09:14 PM Baptiste Coudurier

Change 'arg' type in parse_meta_type, fix warning:
ffmpeg.c: In function ‘parse_meta_type’:
ffmpeg.c:3323:13: warning: assignment discards qualifiers from pointer target type

Originally committed as revision 26312 to svn://svn.ffmpeg.org/ffmpeg/trunk

ee77f986 01/07/2011 10:16 AM Anatoly Nenashev

Fix lowres > 0 with --enable-avfilter..
Fixes issue 2072 and issue 2421.

Patch by Anatoly Nenashev, anatoly d nenashev a ovsoft d ru

Originally committed as revision 26252 to svn://svn.ffmpeg.org/ffmpeg/trunk

b26847b7 01/05/2011 04:52 AM Michael Niedermayer

Fix/cleanup m/ljpeg encoding pix fmt selection code in ffmpeg.c.
Better ideas are welcome ...

Originally committed as revision 26219 to svn://svn.ffmpeg.org/ffmpeg/trunk

ef2b2243 01/02/2011 04:00 PM Anssi Hannula

Use AVOption for muxers in ffmpeg.

Patch by Anssi Hannula, anssi d hannula d iki d fi

Originally committed as revision 26199 to svn://svn.ffmpeg.org/ffmpeg/trunk

1d6233d3 12/31/2010 12:01 AM Aurelien Jacobs

use avsubtitle_free() instead of re-implementing it partially (fix a memleak)

Originally committed as revision 26175 to svn://svn.ffmpeg.org/ffmpeg/trunk

bb62d5c1 12/27/2010 07:46 AM Anton Khirnov

Allow output formats without any streams.

Required for future metadata format.

Originally committed as revision 26100 to svn://svn.ffmpeg.org/ffmpeg/trunk

f6715848 12/12/2010 04:19 PM Stefano Sabatini

Reindent.

Originally committed as revision 25940 to svn://svn.ffmpeg.org/ffmpeg/trunk

8afab686 12/12/2010 04:18 PM Stefano Sabatini

Fix encoding when the input audio format/rate/channels changes during
transcoding.

Fix issue #2292.

Patch sponsored by KIM Keep In Mind GmbH, srl.

Originally committed as revision 25939 to svn://svn.ffmpeg.org/ffmpeg/trunk

5d7870dc 12/10/2010 06:25 PM Justin Ruggles

Show per-codec options on FFmpeg commandline help.

Originally committed as revision 25927 to svn://svn.ffmpeg.org/ffmpeg/trunk

d4a9f379 12/04/2010 02:47 PM Aurelien Jacobs

cosmetic: indentation

Originally committed as revision 25885 to svn://svn.ffmpeg.org/ffmpeg/trunk

118ccae0 12/04/2010 02:46 PM Aurelien Jacobs

add subtitle codec autodetection

Originally committed as revision 25884 to svn://svn.ffmpeg.org/ffmpeg/trunk

037be76e 12/02/2010 08:12 PM Stefano Sabatini

Add avfilter_graph_create_filter().

Originally committed as revision 25862 to svn://svn.ffmpeg.org/ffmpeg/trunk

477b1aea 11/22/2010 07:32 AM Anton Khirnov

ffmpeg.c: copy global metadata by default

Originally committed as revision 25794 to svn://svn.ffmpeg.org/ffmpeg/trunk

63e8d976 11/21/2010 08:06 PM Stefano Sabatini

Use the new libavcore audio channel API.

This also allows to remove a linking dependency of libavfilter on
libavcodec.

Originally committed as revision 25789 to svn://svn.ffmpeg.org/ffmpeg/trunk

7f48bfa1 11/20/2010 08:03 AM Baptiste Coudurier

Cosmetics, fix indentation

Originally committed as revision 25773 to svn://svn.ffmpeg.org/ffmpeg/trunk

cb2c971d 11/13/2010 01:57 PM Aurelien Jacobs

allow passing subtitles header between decoder and encoder

Originally committed as revision 25745 to svn://svn.ffmpeg.org/ffmpeg/trunk

8f55616f 11/13/2010 01:46 PM Aurelien Jacobs

add global header support for subtitles encoding

Originally committed as revision 25742 to svn://svn.ffmpeg.org/ffmpeg/trunk