aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-02-06 20:14:09 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-02-06 20:14:15 +0100
commit474519433634c05a86270f342b3417cbcd9712c3 (patch)
treeb29248526a0c5fa402ad7bbdf1d8dd6832869292 /libavcodec
parent864fdfa0627e21ee0b69e957c3413114185623a7 (diff)
parentc916389bd286ee55a04f68490d83d5e90a07edbc (diff)
downloadffmpeg-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