Merge commit 'e7af52a68dde9144b273a9598b60bf0f56e1323b'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 12 Jun 2015 19:05:09 +0000 (21:05 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 12 Jun 2015 19:05:57 +0000 (21:05 +0200)
commitb5c71fba594353b0676fa41c1f279d42adb6e716
tree8608e7b1529f50deb737289b32b6b34415305b80
parent218f58a16a3dd6c1b3eecef18bb45c04439c7799
parente7af52a68dde9144b273a9598b60bf0f56e1323b
Merge commit 'e7af52a68dde9144b273a9598b60bf0f56e1323b'

* commit 'e7af52a68dde9144b273a9598b60bf0f56e1323b':
  mpegvideo: rv10: Move function declaration to a separate header

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/ituh263dec.c
libavcodec/mpegvideo.h
libavcodec/mpegvideo_enc.c
libavcodec/rv10.c
libavcodec/rv10.h
libavcodec/rv10enc.c
libavcodec/rv20enc.c