aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/rawdec.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-08-21 13:03:40 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-08-21 13:03:40 +0200
commit70a73213b787268b9fdfc92ed418ad9802992b10 (patch)
tree0878d918420c3e0d4ae9bdc849bd7c2d5404c1fd /libavformat/rawdec.h
parente853cf53256f847fc1b8436a4bef060177a01bb2 (diff)
parentc18838f5eb7d7001a9dc653f5162868c04c1b2a1 (diff)
downloadffmpeg-70a73213b787268b9fdfc92ed418ad9802992b10.tar.gz
Merge commit 'c18838f5eb7d7001a9dc653f5162868c04c1b2a1'
* commit 'c18838f5eb7d7001a9dc653f5162868c04c1b2a1': h264_ps: Use more meaningful error values Conflicts: libavcodec/h264_ps.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rawdec.h')
0 files changed, 0 insertions, 0 deletions