aboutsummaryrefslogtreecommitdiffstats
path: root/ffmpeg.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-01-07 01:30:23 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-01-07 01:30:23 +0100
commit55d8cac254ee2aeba051810ca92bb868fcbd8468 (patch)
treefefc7eff8028c9c7df0451625f766c1d4dc7fd87 /ffmpeg.c
parent501db2f32babff8e2851ffd7aeb6bcb1ecb47d19 (diff)
parent6689474b91049411b5b7986616d1c66b701ae11f (diff)
downloadffmpeg-55d8cac254ee2aeba051810ca92bb868fcbd8468.tar.gz
Merge commit '6689474b91049411b5b7986616d1c66b701ae11f'
* commit '6689474b91049411b5b7986616d1c66b701ae11f': v210x: return meaningful error codes. r210dec: return meaningful error codes. vb: cosmetics, reformat Conflicts: libavcodec/vb.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.c')
0 files changed, 0 insertions, 0 deletions