eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-22 15:00:10 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
cdb86136f764e22e795b01eb1cea65403e68cff5
ffmpeg/libavcodec/h264_parser.c
Michael Niedermayer 029353e427 Merge commit 'e9e5a1bdc769a7225ab0d4f8b33bcacc6496bd68' 
* commit 'e9e5a1bdc769a7225ab0d4f8b33bcacc6496bd68':
  Monkey's Audio old versions FATE tests
  h264_parser: Set field_order and picture_structure.

Conflicts:
	libavcodec/h264_parser.c
	tests/fate/lossless-audio.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-24 12:15:56 +02:00

15 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink