diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-18 15:36:32 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-18 15:37:25 +0400 |
commit | 56d3cd1455ea1970165a3ca047a97c3e43a9e9aa (patch) | |
tree | e0f59d1505d58a5d007cfb93f78257a0525d84d1 /libavformat/yuv4mpeg.h | |
parent | 47a721348a5feae818127b821b6cfc47074938d7 (diff) | |
parent | e4dc1000d7bbbcb5b45cf9849fc5315f19578e37 (diff) |
Merge commit 'e4dc1000d7bbbcb5b45cf9849fc5315f19578e37'
* commit 'e4dc1000d7bbbcb5b45cf9849fc5315f19578e37':
yuv4mpeg: split the demuxer and muxer into separate files
Conflicts:
libavformat/yuv4mpegdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/yuv4mpeg.h')
-rw-r--r-- | libavformat/yuv4mpeg.h | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/libavformat/yuv4mpeg.h b/libavformat/yuv4mpeg.h new file mode 100644 index 0000000000..750f498407 --- /dev/null +++ b/libavformat/yuv4mpeg.h @@ -0,0 +1,27 @@ +/* + * YUV4MPEG common definitions + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef AVFORMAT_YUV4MPEG_H +#define AVFORMAT_YUV4MPEG_H + +#define Y4M_MAGIC "YUV4MPEG2" +#define Y4M_FRAME_MAGIC "FRAME" + +#endif /* AVFORMAT_YUV4MPEG_H */ |