diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-04 04:30:42 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-04 04:30:46 +0100 |
| commit | c30281164352ac33a06b155730fe669485852669 (patch) | |
| tree | 9053caa293ae74b28d20da24577fa88932b9d316 /ffmpeg_opt.c | |
| parent | f65afef1df49f53e14c8d4173ff960fff8d44ecb (diff) | |
| parent | c255f0b001da3afa4709f5378680880b8a2dbe61 (diff) | |
| download | ffmpeg-c30281164352ac33a06b155730fe669485852669.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avconv: initialize hwaccel_pix_fmt
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg_opt.c')
| -rw-r--r-- | ffmpeg_opt.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c index dc70c8b6a5..e6ac3ee8e7 100644 --- a/ffmpeg_opt.c +++ b/ffmpeg_opt.c @@ -653,6 +653,7 @@ static void add_input_streams(OptionsContext *o, AVFormatContext *ic) if (!ist->hwaccel_device) exit_program(1); } + ist->hwaccel_pix_fmt = AV_PIX_FMT_NONE; break; case AVMEDIA_TYPE_AUDIO: |