diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-26 14:04:39 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-26 14:05:07 +0200 |
| commit | cf0e8e7ad4881d816546e0391c0e8256cbaa29dc (patch) | |
| tree | 551b9ae009e696c5602e947102aa9e6d000e0d09 /libavformat/mpeg.h | |
| parent | ba650ea11825fdf7df479313bfca2a1003ffd90e (diff) | |
| parent | 4e9e6fa99f3ff83cedbf6c378d62065ae419a3b9 (diff) | |
| download | ffmpeg-cf0e8e7ad4881d816546e0391c0e8256cbaa29dc.tar.gz | |
Merge commit '4e9e6fa99f3ff83cedbf6c378d62065ae419a3b9'
* commit '4e9e6fa99f3ff83cedbf6c378d62065ae419a3b9':
mpeg: Write H264 streams at offset 2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mpeg.h')
| -rw-r--r-- | libavformat/mpeg.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/mpeg.h b/libavformat/mpeg.h index 55f9e0cb51..b43517c30a 100644 --- a/libavformat/mpeg.h +++ b/libavformat/mpeg.h @@ -40,6 +40,7 @@ #define AUDIO_ID 0xc0 #define VIDEO_ID 0xe0 +#define H264_ID 0xe2 #define AC3_ID 0x80 #define DTS_ID 0x88 #define LPCM_ID 0xa0 |