aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/h264pred.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-11-17 01:07:37 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-11-17 01:07:37 +0100
commit5219afc09d8e97e18917738cbc052f903df9a619 (patch)
tree324177cb47f114fb5dabb34f96833ee54b269c6d /libavcodec/h264pred.h
parentbfb1f44d246f4ed97d5cad9c1eace8a20951ff76 (diff)
parent2d2a92f72199823a92e4e226c32e42a27ec801c0 (diff)
downloadffmpeg-5219afc09d8e97e18917738cbc052f903df9a619.tar.gz
Merge commit '2d2a92f72199823a92e4e226c32e42a27ec801c0'
* commit '2d2a92f72199823a92e4e226c32e42a27ec801c0': dxa: use the AVFrame API properly. qpeg: use the AVFrame API properly. cin video: use the AVFrame API properly. msvideo1: use the AVFrame API properly. Conflicts: libavcodec/dsicinav.c libavcodec/dxa.c libavcodec/msvideo1.c libavcodec/qpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264pred.h')
0 files changed, 0 insertions, 0 deletions