eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-22 23:10:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '247e370e2a913db52ca079b347a174c8d393b171'

Browse Source 
* commit '247e370e2a913db52ca079b347a174c8d393b171':
  TDSC decoder

Conflicts:
	Changelog
	doc/general.texi
	libavcodec/Makefile
	libavcodec/allcodecs.c
	libavcodec/version.h
	tests/fate/video.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2015-03-13 23:17:54 +01:00
parent fa4bb7c5b2 247e370e2a
commit e1f37c48e5
12 changed files with 688 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libavcodec/avcodec.h
View File

@@ -291,6 +291,7 @@ enum AVCodecID {
AV_CODEC_ID_MVC1_DEPRECATED,
AV_CODEC_ID_MVC2_DEPRECATED,
AV_CODEC_ID_HQX,
AV_CODEC_ID_TDSC,
AV_CODEC_ID_BRENDER_PIX= MKBETAG('B','P','I','X'),
AV_CODEC_ID_Y41P = MKBETAG('Y','4','1','P'),