ffmpeg_opt.c · 49ec4c7e49a4fe309d85a2e85a21ee526fc162c8 · libremedia / Tethys / FFmpeg

11 years ago

1924a61a

Merge commit '' · 1924a61a

Michael Niedermayer authored 11 years ago


* commit '3d624420':
  avconv_opt: allocate an OutputFile before the streams.

Conflicts:
	ffmpeg_opt.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

1924a61a

History

Merge commit ''

Michael Niedermayer authored 11 years ago


* commit '3d624420':
  avconv_opt: allocate an OutputFile before the streams.

Conflicts:
	ffmpeg_opt.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>