eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-01-07 06:35:30 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
2cffe38df3df8ee1ec0fea0b2a2d3fed6e75da0d
ffmpeg/libavcodec/dvdsubdec.c
Michael Niedermayer 06af724c56 Merge commit 'fb845ffdd335a1efd6dfd43e8adeb530397b348e' 
* commit 'fb845ffdd335a1efd6dfd43e8adeb530397b348e':
  h264: add 3 pixels below for subpixel filter wait position
  dvdsubdec: Support palette in mkv

Conflicts:
	libavcodec/dvdsubdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-16 12:01:21 +01:00

18 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink