diff options
| author | Gilles Chanteperdrix <gilles.chanteperdrix@xenomai.org> | 2015-02-28 23:15:41 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-01 03:40:20 +0100 |
| commit | 071f3e1c6e94b786b04b3496b0b82b4a5cf4e85f (patch) | |
| tree | 0a8bd95b4949122b30cbb326fe6508311accff05 /libavfilter/af_amerge.c | |
| parent | c95c039ec38877e783b97c1a83c3b9d6ee6d03e6 (diff) | |
| download | ffmpeg-071f3e1c6e94b786b04b3496b0b82b4a5cf4e85f.tar.gz | |
Revert "rtsp: Interpret the text media type as AVMEDIA_TYPE_DATA"
This reverts commit 26524e358147aade6e9dd18fff42d61b966bbc70.
If we want the T.140 codec to have the AV_CODEC_ID_TEXT codec id,
its type needs to be AVMEDIA_TYPE_SUBTITLE, so, keep interpreting
the text media type as AVMEDIA_TYPE_SUBTITLE.
Signed-off-by: Gilles Chanteperdrix <gilles.chanteperdrix@xenomai.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/af_amerge.c')
0 files changed, 0 insertions, 0 deletions