OSDN Git Service

Merge commit 'e2ceb17642f374a7df8f1f5d3d2b2446525bc7fb'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 30 Nov 2013 01:42:56 +0000 (02:42 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 30 Nov 2013 01:42:56 +0000 (02:42 +0100)
commitec5499d8bac82007bfc966fb1a7b8233375723cf
treebe754102ba76fd022b9d30463f06a4131177412b
parentb239f3f69d1c10a7d12354a9038c5b109661324e
parente2ceb17642f374a7df8f1f5d3d2b2446525bc7fb
Merge commit 'e2ceb17642f374a7df8f1f5d3d2b2446525bc7fb'

* commit 'e2ceb17642f374a7df8f1f5d3d2b2446525bc7fb':
  mpeg4videodec: move mpeg4-specific post-frame-decode code from h264dec to mpeg4videodec

Conflicts:
libavcodec/h263dec.c
libavcodec/mpeg4video.h
libavcodec/mpeg4videodec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/h263dec.c
libavcodec/mpeg4video.h
libavcodec/mpeg4videodec.c