[FFmpeg-cvslog] Merge commit 'a8b19271c3b40ac3c3dc769fe248887acf14ba5a'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Aug  3 10:48:11 2013 +0200| [82fdfe8e51c593b484fd590368f2d70ef39f2bf8] | committer: Michael Niedermayer

Merge commit 'a8b19271c3b40ac3c3dc769fe248887acf14ba5a'

* commit 'a8b19271c3b40ac3c3dc769fe248887acf14ba5a':
  avcodec: Add output_picture_number to AVCodecParserContext

Conflicts:
	doc/APIchanges
	libavcodec/version.h

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

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