aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/mpegaudiodecheader.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-04-30 00:38:13 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-04-30 00:38:13 +0200
commit37ce3188decae50a14c1d430c49ecc369d5876a6 (patch)
treea5b4eed88d1b50260a36e417e94c991184a8bfc6 /libavcodec/mpegaudiodecheader.c
parentb3d48c315dece7bc599012075cc92e9a80cdd6ec (diff)
parent9d76dd952ffd9fffc7f9fb5cc5af6d093ba54521 (diff)
downloadffmpeg-37ce3188decae50a14c1d430c49ecc369d5876a6.tar.gz
Merge commit '9d76dd952ffd9fffc7f9fb5cc5af6d093ba54521'
* commit '9d76dd952ffd9fffc7f9fb5cc5af6d093ba54521': h264: drop commented out cruft Conflicts: libavcodec/h264_slice.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpegaudiodecheader.c')
0 files changed, 0 insertions, 0 deletions