aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/rmsipr.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-06-12 20:57:37 +0200
committerMichael Niedermayer <michaelni@gmx.at>2015-06-12 20:57:37 +0200
commit218f58a16a3dd6c1b3eecef18bb45c04439c7799 (patch)
tree98205644fd62945cb1ed816744dacc4193941b4d /libavformat/rmsipr.c
parent58f63670e173c1113ab231850572be303a21faef (diff)
parente3d0f49abb20a551bf6d885f75c354d6d0bbeb9d (diff)
downloadffmpeg-218f58a16a3dd6c1b3eecef18bb45c04439c7799.tar.gz
Merge commit 'e3d0f49abb20a551bf6d885f75c354d6d0bbeb9d'
* commit 'e3d0f49abb20a551bf6d885f75c354d6d0bbeb9d': mpegvideo: h263: Move all tables to a single file Conflicts: libavcodec/h263.h libavcodec/h263data.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rmsipr.c')
0 files changed, 0 insertions, 0 deletions