OSDN Git Service

Merge commit 'b452d5ae866942cec00aa1432fe29498b38b49fc'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 30 Nov 2013 01:25:51 +0000 (02:25 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 30 Nov 2013 01:27:41 +0000 (02:27 +0100)
commit2b1922d9641012a01eee144a4410f5e94ccfbec7
tree63f63d8d4383a2a661bd6da140f7275d6b719a29
parent6c9b82b6a0d5cbdf90dcbf9f4e1c77ae82c5698f
parentb452d5ae866942cec00aa1432fe29498b38b49fc
Merge commit 'b452d5ae866942cec00aa1432fe29498b38b49fc'

* commit 'b452d5ae866942cec00aa1432fe29498b38b49fc':
  mpeg4videodec: move mpeg4-specific bug detection from h263 generic code to mpeg4

Conflicts:
libavcodec/h263dec.c

not merged, the header decode function is not the right place
See: 6c9b82b6a0d5cbdf90dcbf9f4e1c77ae82c5698f

Merged-by: Michael Niedermayer <michaelni@gmx.at>