aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/rtmppkt.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-03-26 13:14:16 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-03-26 13:14:16 +0100
commit795b911bd8acaec4b6f7dc1590f63a529c028ac8 (patch)
treeef7cd0b106ca457cae871497aff89e22b8d7eacb /libavformat/rtmppkt.h
parent9b9205e760d226a7dfa1c7ba8d94694f097c8510 (diff)
parent613a37eca4c7b8eefceaa3e0231c23ad090ca94f (diff)
downloadffmpeg-795b911bd8acaec4b6f7dc1590f63a529c028ac8.tar.gz
Merge commit '613a37eca4c7b8eefceaa3e0231c23ad090ca94f'
* commit '613a37eca4c7b8eefceaa3e0231c23ad090ca94f': ape: 3.80-3.92 decoding support h264: Remove an unused variable Conflicts: libavcodec/apedec.c libavformat/ape.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtmppkt.h')
0 files changed, 0 insertions, 0 deletions