]> git.sesse.net Git - ffmpeg/commitdiff
Merge commit 'b4d372e091f6b30758db2a43a5a9fe2510ec2b13'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 8 Mar 2014 23:57:22 +0000 (00:57 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 8 Mar 2014 23:59:00 +0000 (00:59 +0100)
* commit 'b4d372e091f6b30758db2a43a5a9fe2510ec2b13':
  rv10: Forward error from rv10_decode_packet

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/rv10.c

Simple merge