aboutsummaryrefslogtreecommitdiffstats
path: root/libavresample/x86
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-01-06 23:59:35 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-01-06 23:59:35 +0100
commit7b018e5c8d182b0272477322377b8daafa1c970f (patch)
tree8f526f00d6352279d84ff8c7bcfbb2f78f702bd1 /libavresample/x86
parent61904467458b16cf89530e2d0875f3786001dc11 (diff)
parent84f2847de394ac447f53306bd4dd73e1af6ea5e4 (diff)
downloadffmpeg-7b018e5c8d182b0272477322377b8daafa1c970f.tar.gz
Merge commit '84f2847de394ac447f53306bd4dd73e1af6ea5e4'
* commit '84f2847de394ac447f53306bd4dd73e1af6ea5e4': xl: return a meaningful error code. xan: return a meaningful error code. xxan: return meaningful error codes. zmbv: return more meaningful error codes. yop: use a meaningful error code. c93: return meaningful error codes. bmv: return meaningful error codes. bmp: return meaningful error codes. bink: operate with pointers to AVFrames instead of whole structs. bink: return meaningful error codes. bfi: return meaningful error codes. bethsoftvideo: return meaningful error codes. Conflicts: libavcodec/c93.c libavcodec/xl.c libavcodec/xxan.c libavcodec/yop.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavresample/x86')
0 files changed, 0 insertions, 0 deletions