diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-23 20:15:17 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-23 20:15:21 +0100 |
| commit | c1333a762c0e3d832f2142c63c918888ff32a618 (patch) | |
| tree | 7775ec919f0beeefb47b9276173f3d0c1cffec5f /ffmpeg_opt.c | |
| parent | 094516a5d0f8ebdb09464d6a4d1757ecb38622f6 (diff) | |
| parent | 2aec9e228cb317cca8cda9e03986c8482ea54404 (diff) | |
| download | ffmpeg-c1333a762c0e3d832f2142c63c918888ff32a618.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
rtpdec_asf: Copy the need_parsing field from the chained demuxer
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg_opt.c')
0 files changed, 0 insertions, 0 deletions