aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/rmsipr.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-01-21 15:34:57 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-01-21 16:07:21 +0100
commitdb23d5de27187dd8f2ec5c6dfd98a8a363b0fda5 (patch)
tree01b9286e8a7d1e83c4b8d734d7767a3115838561 /libavformat/rmsipr.h
parent2cf9ab655549cf2f25ba57ee84baa6d38530ec3b (diff)
parente6bc38fd49c94726b45d5d5cc2b756ad8ec49ee0 (diff)
downloadffmpeg-db23d5de27187dd8f2ec5c6dfd98a8a363b0fda5.tar.gz
Merge commit 'e6bc38fd49c94726b45d5d5cc2b756ad8ec49ee0'
* commit 'e6bc38fd49c94726b45d5d5cc2b756ad8ec49ee0': wmv2: move IDCT to its own DSP context. Conflicts: libavcodec/dsputil.h tests/ref/seek/vsynth2-wmv2 tests/ref/vsynth/vsynth1-wmv2 tests/ref/vsynth/vsynth2-wmv2 Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rmsipr.h')
0 files changed, 0 insertions, 0 deletions