[FFmpeg-cvslog] Merge commit 'ad09f52586eae4c5473c3a6a803d73e1ba56c0eb'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Nov 29 23:46:30 2013 +0100| [f5d6541ba0d279955a2df798646e30370d85458a] | committer: Michael Niedermayer

Merge commit 'ad09f52586eae4c5473c3a6a803d73e1ba56c0eb'

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

Conflicts:
	libavcodec/h263dec.c

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f5d6541ba0d279955a2df798646e30370d85458a
---