Merge commit 'a8b19271c3b40ac3c3dc769fe248887acf14ba5a'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 3 Aug 2013 08:48:11 +0000 (10:48 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 3 Aug 2013 08:48:11 +0000 (10:48 +0200)
commit82fdfe8e51c593b484fd590368f2d70ef39f2bf8
treeff95c2e7a87ca4929a8471e30765b8c7724faea6
parent1607a985455287ccae3bfa46393a6cdfc04ce64f
parenta8b19271c3b40ac3c3dc769fe248887acf14ba5a
Merge commit 'a8b19271c3b40ac3c3dc769fe248887acf14ba5a'

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

Conflicts:
doc/APIchanges
libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
doc/APIchanges
libavcodec/avcodec.h
libavcodec/h264.c
libavcodec/h264_parser.c
libavcodec/version.h