diff options
| author | Mike Melanson <mike@multimedia.cx> | 2004-06-19 14:51:46 +0000 |
|---|---|---|
| committer | Mike Melanson <mike@multimedia.cx> | 2004-06-19 14:51:46 +0000 |
| commit | 9be653d0e995d01155528ed0d0d01894f52ae047 (patch) | |
| tree | 1922fdccc8da517b5187ed5dd24bbdbdcb63085e /libavformat/mpeg.c | |
| parent | 0bd586c50dc27ec38ca94e58f50030544d729463 (diff) | |
cvs diff before cvs commit
Originally committed as revision 3240 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/mpeg.c')
| -rw-r--r-- | libavformat/mpeg.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/libavformat/mpeg.c b/libavformat/mpeg.c index a478782dd4..dd4e524111 100644 --- a/libavformat/mpeg.c +++ b/libavformat/mpeg.c @@ -1351,14 +1351,6 @@ static int mpegps_read_packet(AVFormatContext *s, pkt->stream_index, pkt->pts / 90000.0, pkt->dts / 90000.0); #endif -#if 1 -//#ifdef CONFIG_ADX - if (codec_id == CODEC_ID_MP2 && is_adx(pkt->data,pkt->size)) { -printf ("found ADX...\n"); - st->codec.codec_id = CODEC_ID_ADPCM_ADX; - } -#endif //CONFIG_ADX - return 0; } |