diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-06 20:14:09 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-06 20:14:15 +0100 |
commit | 474519433634c05a86270f342b3417cbcd9712c3 (patch) | |
tree | b29248526a0c5fa402ad7bbdf1d8dd6832869292 /libavcodec | |
parent | 864fdfa0627e21ee0b69e957c3413114185623a7 (diff) | |
parent | c916389bd286ee55a04f68490d83d5e90a07edbc (diff) | |
download | ffmpeg-474519433634c05a86270f342b3417cbcd9712c3.tar.gz |
Merge remote-tracking branch 'rdp/combined2'
* rdp/combined2:
dshow: allow for more codec ID's
dshow: better error reporting
dshow: fix log message
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
0 files changed, 0 insertions, 0 deletions