eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-01-05 13:45:37 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
8ccfafa7b41b8239cfbbaa5dfd8eea8a300c64be
ffmpeg/libavcodec/mpeg12.h
Michael Niedermayer 2bfcd74ad3 Merge commit 'e557584aa7df6ac9f52af7ee7e5c963437da2e2f' 
* commit 'e557584aa7df6ac9f52af7ee7e5c963437da2e2f':
  mpeg12: Move Mpeg1Context declaration to the only place it is used

Conflicts:
	libavcodec/mpeg12.h
	libavcodec/mpeg12dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-28 11:56:05 +01:00

2.1 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink