virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-10-30 23:18:11 +02:00
Code Issues Releases Activity

Merge commit '77bd1bc73a1946b0f0ce09a7cbb242a65e138d06'

Browse Source 
* commit '77bd1bc73a1946b0f0ce09a7cbb242a65e138d06':
  avconv: use new options parser.

Conflicts:
	ffmpeg.c
	ffmpeg.h
	ffmpeg_opt.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2012-12-20 02:38:02 +01:00
parent 52b866471e 77bd1bc73a
commit af4b1c02ac
5 changed files with 187 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cmdutils.h
View File

@@ -254,6 +254,7 @@ typedef struct OptionGroup {
AVDictionary *codec_opts;
AVDictionary *format_opts;
struct SwsContext *sws_opts;
struct SwrContext *swr_opts;
} OptionGroup;
/**