summaryrefslogtreecommitdiff
path: root/ffmpeg.c
diff options
context:
space:
mode:
authorEvgeniy Stepanov <eugeni.stepanov@gmail.com>2008-01-27 15:43:17 +0000
committerAurelien Jacobs <aurel@gnuage.org>2008-01-27 15:43:17 +0000
commitf8d7c9d373a8aeede75454a5d51de958b2321478 (patch)
tree3417638f4bcfd2656c2bc4dad32b30b77bdd5975 /ffmpeg.c
parent20963a71565b3d11815d0f9914c16aab873bd58b (diff)
Add support for Matroska attachments.
patch by eugeni _dot_ stepanov _at_ gmail.com and myself Originally committed as revision 11635 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'ffmpeg.c')
-rw-r--r--ffmpeg.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index 97526cbceb..a4800685eb 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -2776,6 +2776,7 @@ static void opt_input_file(const char *filename)
if(subtitle_disable)
ic->streams[i]->discard = AVDISCARD_ALL;
break;
+ case CODEC_TYPE_ATTACHMENT:
case CODEC_TYPE_UNKNOWN:
break;
default:
@@ -2825,6 +2826,7 @@ static void check_audio_video_sub_inputs(int *has_video_ptr, int *has_audio_ptr,
has_subtitle = 1;
break;
case CODEC_TYPE_DATA:
+ case CODEC_TYPE_ATTACHMENT:
case CODEC_TYPE_UNKNOWN:
break;
default: