Merge commit 'e3d0f49abb20a551bf6d885f75c354d6d0bbeb9d'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 12 Jun 2015 18:57:37 +0000 (20:57 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 12 Jun 2015 18:57:37 +0000 (20:57 +0200)
commit218f58a16a3dd6c1b3eecef18bb45c04439c7799
tree98205644fd62945cb1ed816744dacc4193941b4d
parent58f63670e173c1113ab231850572be303a21faef
parente3d0f49abb20a551bf6d885f75c354d6d0bbeb9d
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>
12 files changed:
libavcodec/Makefile
libavcodec/flvenc.c
libavcodec/h263.c
libavcodec/h263.h
libavcodec/h263data.c
libavcodec/h263data.h
libavcodec/ituh263dec.c
libavcodec/ituh263enc.c
libavcodec/motion_est.h
libavcodec/mpegvideo_enc.c
libavcodec/rv10.c
libavcodec/rv20enc.c