[FFmpeg-devel] [PATCH] lavf/options_table: replace avconv with ffmpeg

[Michael Niedermayer]

On Wed, Oct 17, 2012 at 11:30:32PM +0000, Paul B Mahol wrote:
> Signed-off-by: Paul B Mahol <onemda at gmail.com>
> ---
>  libavformat/options_table.h | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/libavformat/options_table.h b/libavformat/options_table.h
> index 778c740..5f60e6b 100644
> --- a/libavformat/options_table.h
> +++ b/libavformat/options_table.h
> @@ -59,9 +59,9 @@ static const AVOption options[]={
>  {"audio_preload", "microseconds by which audio packets should be interleaved earlier", OFFSET(audio_preload), AV_OPT_TYPE_INT, {.i64 = 0}, 0, INT_MAX-1, E},
>  {"chunk_duration", "microseconds for each chunk", OFFSET(max_chunk_duration), AV_OPT_TYPE_INT, {.i64 = 0}, 0, INT_MAX-1, E},
>  {"chunk_size", "size in bytes for each chunk", OFFSET(max_chunk_size), AV_OPT_TYPE_INT, {.i64 = 0}, 0, INT_MAX-1, E},
> -/* this is a crutch for avconv, since it cannot deal with identically named options in different contexts.
> - * to be removed when avconv is fixed */
> -{"f_err_detect", "set error detection flags (deprecated; use err_detect, save via avconv)", OFFSET(error_recognition), AV_OPT_TYPE_FLAGS, {.i64 = AV_EF_CRCCHECK }, INT_MIN, INT_MAX, D, "err_detect"},
> +/* this is a crutch for ffmpeg, since it cannot deal with identically named options in different contexts.
> + * to be removed when ffmpeg is fixed */

ive just posted a patch that fixes this for ffmpeg

[...]

-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

Democracy is the form of government in which you can choose your dictator
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20121018/f098d8aa/attachment.asc>