diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-27 15:03:56 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-27 15:04:00 +0200 |
| commit | e2a5557cbb7fbcdf38a3240112cbc452930fe8b1 (patch) | |
| tree | 72d1d58af717382d33d48eff4f084ba4c4c5abaf | |
| parent | e9ad121ba53230ef20674599047ed1889982d698 (diff) | |
| parent | 4abbea0243eca7c62949c4c4c604482c83bf1d8c (diff) | |
| download | ffmpeg-e2a5557cbb7fbcdf38a3240112cbc452930fe8b1.tar.gz | |
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
lavf/mpeg.h: Remove an unused definition.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/mpeg.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavformat/mpeg.h b/libavformat/mpeg.h index cf10d6a4c4..55f9e0cb51 100644 --- a/libavformat/mpeg.h +++ b/libavformat/mpeg.h @@ -57,7 +57,6 @@ #define STREAM_TYPE_VIDEO_CAVS 0x42 #define STREAM_TYPE_AUDIO_AC3 0x81 -#define STREAM_TYPE_AUDIO_DTS 0x8a static const int lpcm_freq_tab[4] = { 48000, 96000, 44100, 32000 }; |