highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
87e8cbf70931b789efc04c978082fc5181a51a26
ffmpeg/libavcodec/h264_parser.c
Michael Niedermayer 82fdfe8e51 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>
2013-08-03 10:48:11 +02:00

16 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink