OSDN Git Service

Merge commit 'ad09f52586eae4c5473c3a6a803d73e1ba56c0eb'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 29 Nov 2013 22:46:30 +0000 (23:46 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 29 Nov 2013 22:46:30 +0000 (23:46 +0100)
commitf5d6541ba0d279955a2df798646e30370d85458a
tree3ee7c30cd371173edccdc9e52b559f7f173053b9
parent91c63cb053cd7a1be8bb22b3857a170eeb2b1f95
parentad09f52586eae4c5473c3a6a803d73e1ba56c0eb
Merge commit 'ad09f52586eae4c5473c3a6a803d73e1ba56c0eb'

* commit 'ad09f52586eae4c5473c3a6a803d73e1ba56c0eb':
  h263dec: remove commented out cruft

Conflicts:
libavcodec/h263dec.c

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