Statistics
| Branch: | Revision:

ffmpeg / ffmpeg.c @ 4869f47e

History | View | Annotate | Download (138 KB)

# Date Author Comment
7246177d 08/14/2008 10:01 PM Aurelien Jacobs

ensure we get explicit definition of various _XOPEN_SOURCE functions we use

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

81b060fa 08/12/2008 05:59 AM Loren Merritt

align the audio decoding buffer, since some codecs write to it with simd

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

f44fd374 08/03/2008 01:38 PM Stefano Sabatini

Increase the maximum number of supported stream mappings in ffmpeg.c.
The new value is given by maximum_files_nb * maximum_streams_per_file_nb,
which looks also more correct in respect to the previous value.

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

a79db0f7 08/03/2008 12:37 AM Peter Ross

Add sample format converter to FFmpeg (adds -sample_fmt option)

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

ce1ee094 07/31/2008 01:11 PM Peter Ross

Add opt handler for pending "-sample_fmt" option

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

150d5a25 07/28/2008 09:54 PM Stefano Sabatini

Make ffmpeg dump output format in case of codec type mismatch between
an input stream and the corresponding output stream.

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

aa29709e 07/26/2008 07:08 AM Peter Ross

add CODEC_ID_PCM_F32BE (32-bit floating point PCM big endian decoder)

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

e16190fa 07/24/2008 09:12 PM Diego Biurrun

cosmetics: typo fixes

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

0042808e 07/19/2008 04:01 PM Michael Niedermayer

Remove explicit strict_std_compliance support as it seems to work fine over
AVOptions, actually it works even finer as it also gets passed to the
decoder.

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

fc7ad2af 07/18/2008 10:23 PM Stefano Sabatini

Make ffmpeg -t X with X<=0 transcode nothing.

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

44eb047a 07/18/2008 01:52 PM Michael Niedermayer

Correcting displayed muxing overhead and video stream size.
Partially fixes issue348.

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

8833f375 07/13/2008 10:55 PM Michael Niedermayer

-itsscale to scale timestamps
fixes issue511

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

89129c6b 07/13/2008 09:59 PM Diego Biurrun

Drop non-C99-compliant initialization.

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

bd6754aa 07/13/2008 09:39 PM Michael Niedermayer

On EOF keep calling the decoders until they do not output anything
anymore, instead of just once.

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

8858816d 07/13/2008 04:19 PM Michael Niedermayer

Use -vsync 0 unless the user explicitly asked for something
else when the framerate is above 1000.
Fixes issue259.

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

d08e3e91 07/12/2008 11:43 AM Ramiro Polla

Prevent users from setting -vol and -acodec copy together.
They are incompatible since the frames are not decoded, so they can't be preprocessed.

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

4e999ebe 07/09/2008 06:57 AM Michael Niedermayer

indent

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

385b19df 07/09/2008 06:56 AM Michael Niedermayer

Allow setting codecs through preset files

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

8dbee653 07/08/2008 11:50 PM Michael Niedermayer

Fix the av_set_string() free / alloc issue.

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

b86f5a02 06/26/2008 08:50 PM Michael Niedermayer

Register intrrupt_cb() early enough so we dont get stuck with tcp input
for example.
Fixes issue66

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

9010d543 06/25/2008 09:48 PM Stefano Sabatini

Remove unnecessary function opt_qdiff(), max_qdiff is set now through
the AVOption system. Also removes the previous constraints when
setting max_qdiff through opt_qdiff() (1 <= max_qdiff <= 31).

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

181782ae 06/25/2008 01:46 PM Michael Niedermayer

Use correct timestamp value for stream copy.

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

9c09099e 06/22/2008 04:20 PM Stefano Sabatini

Cosmetics: move ffmpeg.c dframes option definition from within the
video options to the generic options where it belongs.

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

d2ce2f5e 06/22/2008 01:36 AM Baptiste Coudurier

cosmetics, reindent

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

dbedf2aa 06/22/2008 01:35 AM Baptiste Coudurier

enable feeder threads

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

88643f39 06/17/2008 10:11 AM Stefano Sabatini

Cosmetics: display ffmpeg -h generic advanced options just after
generic non-advanced options.

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

ef3efa0d 06/16/2008 01:02 PM Stefano Sabatini

Don't show advanced subtitle options within the ffmpeg -h generic
advanced options.

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

fb74bc43 06/16/2008 10:00 AM Stefano Sabatini

Don't show subtitle and grab options within the ffmpeg -h generic options.

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

d58ddafd 06/12/2008 10:30 PM Stefano Sabatini

Make ffmpeg.c use print_error() when it can't read an ffserver stream.

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

462cca10 06/12/2008 10:07 PM Stefano Sabatini

Improve ffmpeg error reporting in case of input/output stream mismatch,
enabling a dump_format() of the mismatched output stream.

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

d18811bb 06/12/2008 09:21 PM Stefano Sabatini

Make ffmpeg.c:opt_thread use parse_number_or_die().

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

3022cd10 06/12/2008 11:28 AM Stefano Sabatini

Factorize options context setting.
Patch by Stefano Sabatini stefano sabatini-lala posteit

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

837d248d 06/12/2008 01:43 AM Baptiste Coudurier

enable stream copy with ffserver, to be able to chain

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

6dfafe10 06/11/2008 11:45 PM Baptiste Coudurier

set log debug when avformat debug is set

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

3438d82d 06/09/2008 12:24 AM Baptiste Coudurier

remove ugly ffm_nopts hack, use AVFormatContext->timestamp

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

e66ace6f 06/08/2008 10:52 AM Michael Niedermayer

Support longer paths for and longer names in preset files.

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

439c18c7 06/08/2008 10:48 AM Michael Niedermayer

indent

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

23b20b5c 06/08/2008 10:48 AM Michael Niedermayer

Search /usr(/local)/share for preset files as well.
This also fixed a null pointer dereference if HOME isnt set.

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

d9f1b68c 06/07/2008 09:12 AM Michael Niedermayer

Presets support.
How per codec defaults and ranges will be supported is still being discussed.

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

e992fba4 05/31/2008 06:36 PM Stefano Sabatini

Add a few newlines to 'ffmpeg -h' output to make it more readable.
patch by Stefano Sabatini, stefano.sabatini-lala poste it

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

418a0b9f 05/31/2008 02:22 PM Peter Ross

Compiling ffmpeg.c fails when when the .ffm demuxer is enabled, but the .ffm
muxer is disabled. The cause is an incorrect #ifdef that assumes that the
ffm_nopts symbol (global define in ffmenc) is present when either ffm muxer
OR demuxer is enabled.
patch by Peter Ross, pross xvid org...

573e8cb3 05/30/2008 08:30 PM Michael Niedermayer

Remove incorrect usage of av_free_static(), ffmpeg.c is not a
windows dll which can be unloaded and loaded again.

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

9d58e0a9 05/29/2008 09:26 PM Baptiste Coudurier

cosmetics, space before and after parenthesis, weird indentation

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

f094b662 05/29/2008 01:40 PM Erik Hovland

Remove unnecessary header #includes.
Extracted from a patch by Erik Hovland, erik hovland org.

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

ea9c581f 05/29/2008 08:48 AM Stefano Sabatini

Simplify show_banner() so that it does not require arguments, similar
to what was previously done with show_version().
patch by Stefano Sabatini, stefano.sabatini-lala poste it

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

e5f6b7e5 05/28/2008 11:55 AM Stefano Sabatini

Slightly clarify bitstream filter help output.
patch by Stefano Sabatini, stefano.sabatini-lala poste it

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

e6b4e4ff 05/28/2008 11:34 AM Michael Niedermayer

Remove coded_frame==NULL checks for video encoders.

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

1234da4c 05/27/2008 01:26 AM Baptiste Coudurier

use av_fifo_generic_write, old func is deprecated

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

bcbd328e 05/26/2008 12:47 AM Michael Niedermayer

Make stream copy of ac3 from riff based formats work.

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

fa3b9818 05/25/2008 11:04 PM Michael Niedermayer

Ensure that one can store X bytes in a fifo of size X.
Fixed issue417.

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

0871ae1a 05/25/2008 10:20 PM Michael Niedermayer

Make av_fifo*_read() ignore the available amount of data.
This is more efficient as in practice the check is redundant most of the
time. Callers which do not know if enough data is available have to check
it with av_fifo_size(). Doing the check in *read() means the caller has...

46eab093 05/25/2008 08:34 PM Michael Niedermayer

Make opt_verbose() work again.

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

ba9880c1 05/22/2008 12:55 PM Stefano Sabatini

Move show_formats() to cmdutils.c.
Patch by: Stefano Sabatini, stefano.sabatini-lala poste it

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

20176cbc 05/21/2008 11:41 PM Michael Niedermayer

Get rid of more senseless wrapper functions and use OPT_EXIT instead.

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

64555bd9 05/21/2008 11:36 PM Michael Niedermayer

Do not pass program_name as argument to show_version(), this allows some
future simplifications.

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

a0b3bcd9 05/21/2008 11:27 PM Michael Niedermayer

OPT_EXIT

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

475f4d8d 05/21/2008 05:44 PM David Bolt

Print timestamp with increased precision.
Patch by David Bolt

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

54d2d4f6 05/13/2008 03:36 PM Stefano Sabatini

Make 'ffmpeg -formats' print codec long names.
patch by Stefano Sabatini, stefano.sabatini-lala poste it

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

0a1b29de 05/11/2008 11:17 AM Dave Yeo

sys/resource.h needs sys/types.h on OS/2, patch by Dave Yeo, daveryeo telus net

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

245976da 05/09/2008 11:56 AM Diego Biurrun

Use full path for #includes from another directory.

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

b091aa44 05/08/2008 12:44 AM Ramiro Polla

Check for sys/resource.h and include it conditionally.

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

580a6c57 05/01/2008 03:12 PM Diego Pettenò

Mark symbols as static, patch by Diego 'Flameeyes' Pettenò, flameeyes gmail com

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

c48da33c 04/22/2008 08:17 PM Stefano Sabatini

Send context to some ffmpeg.c opt* function

Patch by Stefano Sabatini ( stefano sabatini-lala poste it )

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

66824f99 04/21/2008 08:59 AM Stefano Sabatini

Make some ffmpeg opts use parse-number-or-die.
Patch by Stefano Sabatini stefano sabatini-lala posteit

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

8767060c 04/21/2008 01:22 AM Ramiro Polla

Fix bug introduced by r12827.
If av_exit() was called after an AVFormatContext was created, but before
its file was opened, av_exit() would pass a NULL pointer to url_fclose().

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

296df4e7 04/14/2008 10:35 PM Ramiro Polla

Use av_exit() instead of exit() for a minimal cleanup
before leaving ffmpeg.
Needed by some grab devices and possibly network streams.

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

e5295c0d 04/14/2008 10:31 PM Ramiro Polla

Move av_exit() so it can be used by more functions
without needing forward declaration.

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

6363827e 04/08/2008 01:01 AM Stefano Sabatini

Complete argument information in ffmpeg.c:options for non-number arguments

Patch by Stefano Sabatini ( stefano sabatini-lala poste it )

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

7542157d 03/31/2008 10:01 AM Stefano Sabatini

Export parse_time_or_die from ffmpeg.c to cmdutils.c

Patch by Stefano Sabatini (stefano sabatini-lala poste it)

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

b19221c8 03/22/2008 03:12 PM Stefano Sabatini

Make option time parsing functions take argument from options

Patch by Stefano Sabatini ( stefano sabatini-lala poste it )

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

972d628a 03/17/2008 09:33 AM Stefano Sabatini

Provide a context to parse_time_or_die().
Patch by Stefano Sabatini: stefano sabatini-lala poste it

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

90c2295b 03/07/2008 07:25 PM Evgeniy Stepanov

Add 'disposition' bitfield to AVStream and use it for both muxing and demuxing
of matroska and nut.

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

e60da588 03/05/2008 04:02 AM Michael Niedermayer

sws_flags is unsigned.
This together with the last commit fixes the strange behavior of -sws_flags.
(issue229)

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

3948c74f 03/01/2008 11:36 PM Michael Niedermayer

Remove INFINITY.

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

53d1bdba 02/25/2008 04:01 PM Stefano Sabatini

Clarify the documentation for 'ffmpeg -v'.
patch by Stefano Sabatini, stefano.sabatini-lala poste it

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

10e7fc7c 02/24/2008 01:56 AM Michael Niedermayer

Reduce initial fifo size, so as not to senselessly waste memory.

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

a6ebca9e 02/24/2008 01:55 AM Michael Niedermayer

realloc fifo

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

b3574faa 02/18/2008 03:30 PM Stefano Sabatini

Remove a superfluous call to atoi in ffmpeg.c:opt_verbose

Patch by Stefano Sabatini ( stefano sabatini-lala poste it )
[FFmpeg-devel] [PATCH] Cosmetics: remove a superfluos call to atoi in
ffmpeg.c:opt_verbose

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

5bc440e7 02/17/2008 09:31 PM Michael Niedermayer

Add notes where known timestamp issues remain.

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

48291040 02/17/2008 08:12 PM Michael Niedermayer

Set initial next_pts to unknown, this avoids the nonsense timestamp
discontinuity at the start. I hope this has no sideeffects, if it does
send a bugreport!
fixes issue137

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

40cb57a2 02/17/2008 07:38 PM Michael Niedermayer

Print a warning if a decoder produces more than 1 frame of output for
a single frame it got from the demuxer+parser.

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

ed923859 02/17/2008 07:08 PM Michael Niedermayer

Set next_pts to pts if it is unknown and pkt->dts is not known either. This
is needed because next_pts is used to calculate the next pts and adding
to AV_NOPTS_VALUE does not achieve the intended result.

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

b1b818fc 02/17/2008 05:55 PM Michael Niedermayer

simplify (next_)pts code

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

da0ef2d5 02/17/2008 05:41 PM Michael Niedermayer

Use next_pts if pkt->dts is unknown. In an ideal world this would not be needed
but sadly there are cases where the timestamps cannot be found without decoding.

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

19d5da50 02/15/2008 09:45 PM Michael Niedermayer

Update ist->pts after decoding a codec frame not after decoding a container
frame.

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

880add37 02/14/2008 06:53 PM Michael Niedermayer

-vsync 2 (drop frames if there are too many but do not duplicate any)

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

c4c52acc 02/09/2008 06:07 PM Diego Biurrun

Remove pointless #if.

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

f73008d8 02/04/2008 12:37 AM Michael Niedermayer

const

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

815f98cc 02/02/2008 12:54 AM Aurelien Jacobs

non-const 2nd parameter for strtol/strtod

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

99fb79b5 02/01/2008 01:08 PM Baptiste Coudurier

Do not print quality when stream copy,
Silence valgrind complaint:
14746 Conditional jump or move depends on uninitialised value(s)
14746 at 0x43488DF: (within /lib/i686/cmov/libc-2.7.so)
14746 by 0x434ED81: __printf_fp (in /lib/i686/cmov/libc-2.7.so)...

e1cc8339 01/28/2008 09:13 PM Reimar Döffinger

Add sbsf option for subtitle bitstream filter

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

f8d7c9d3 01/27/2008 03:43 PM Evgeniy Stepanov

Add support for Matroska attachments.
patch by eugeni dot stepanov at gmail.com and myself

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

1f8e32cd 01/22/2008 08:52 AM Diego Biurrun

cosmetics: Fix Benoit's ugly formatting.

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

7055cdac 01/21/2008 01:36 PM Benoit Fouet

Inform user when bitstream filter fails.

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

ab759f6e 01/10/2008 10:25 AM kweiner@spamcop.net

Add "genre" command line option
Patch by kweiner spamcop net
closes Issue318

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

8b389f15 01/09/2008 06:22 AM Andreas Öman

Correctly use output format stream index for bitstream filter when doing stream copy.

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

8e4270c5 01/07/2008 08:42 PM Andreas Öman

Dont crash if resampling is requested but no audio packets are ever processed.

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

ebde2a2c 01/02/2008 10:24 AM Morten Hustveit

Fix prototype and return value of opt_bitrate and opt_bsf.
Patch by Morten Hustveit: lists rashbox org

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

464a631c 01/02/2008 10:22 AM Morten Hustveit

Define rc override string as const.
Patch by Morten Hustveit: lists rashbox org

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

9de0be61 12/26/2007 10:28 PM Michael Niedermayer

Do not force fps unless the user actually specified one.
fixes issue309

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