aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/msmpeg4data.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-12-09 16:07:17 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-12-09 16:07:17 +0100
commitf4332e959161ef7a58564104e092148ef7409d7d (patch)
treef73b9e9d8ba7c701e7634dbfa072309ba3715021 /libavcodec/msmpeg4data.h
parentcefabaad3e882004ca7a54ea39500ee8e1c6ea93 (diff)
parentd4f0f2d1e80b76260eb6b9cdde472ac069dfda56 (diff)
downloadffmpeg-f4332e959161ef7a58564104e092148ef7409d7d.tar.gz
Merge commit 'd4f0f2d1e80b76260eb6b9cdde472ac069dfda56'
* commit 'd4f0f2d1e80b76260eb6b9cdde472ac069dfda56': lavc: use buf[0] instead of data[0] as the indicator of an allocated frame Conflicts: libavcodec/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/msmpeg4data.h')
0 files changed, 0 insertions, 0 deletions