aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/jacosubdec.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-04-05 18:48:42 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-04-05 18:54:15 +0200
commit5440151fa42d4e18c83bc42ff31526680697e645 (patch)
tree43851c2293c5cc89326ef227674a0f059290e904 /libavformat/jacosubdec.c
parenta1ac12bddd8ddb184281eadf5431dce29c02f27a (diff)
parent3dc6272bed7890a49080e18eacf3c7a4a6594b0d (diff)
downloadffmpeg-5440151fa42d4e18c83bc42ff31526680697e645.tar.gz
Merge commit '3dc6272bed7890a49080e18eacf3c7a4a6594b0d'
* commit '3dc6272bed7890a49080e18eacf3c7a4a6594b0d': Remove a number of unnecessary dsputil.h #includes Conflicts: libavcodec/h264pred.c libavcodec/vc1dsp.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/jacosubdec.c')
0 files changed, 0 insertions, 0 deletions