aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/rso.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-03-21 12:34:59 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-03-21 12:34:59 +0100
commit137df692fc28710aa1a21856b1f5b9e157896fef (patch)
tree89d3f10251855bf0b7ec9519844422a420609bb5 /libavformat/rso.h
parentbbc0f6f9789361f9ddd462bc458410e6f0081d57 (diff)
parent48d0fd2d62a476e1db9298163f1fc0abae26cc67 (diff)
downloadffmpeg-137df692fc28710aa1a21856b1f5b9e157896fef.tar.gz
Merge commit '48d0fd2d62a476e1db9298163f1fc0abae26cc67'
* commit '48d0fd2d62a476e1db9298163f1fc0abae26cc67': h264: merge common_init() into ff_h264_decode_init. Conflicts: libavcodec/h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rso.h')
0 files changed, 0 insertions, 0 deletions