diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-10 11:57:14 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-10 11:58:58 +0200 |
| commit | c2555bcbd147d068c47363ba294e9c21cfceb6c7 (patch) | |
| tree | 8f33502e4fcdc2eda1c57c82e15154f3f65f9ee9 /libavformat/flvenc.c | |
| parent | 0efbd98e233194659d6ff47e871924d0756539b5 (diff) | |
| parent | be1e1373d267bae2af8a62d79eef736736f24565 (diff) | |
Merge commit 'be1e1373d267bae2af8a62d79eef736736f24565'
* commit 'be1e1373d267bae2af8a62d79eef736736f24565':
flvenc: Support muxing VP6A as well
Conflicts:
libavformat/flvenc.c
See: 42ae83c196d5747e8a87772a50a02a7b3f2855c3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/flvenc.c')
| -rw-r--r-- | libavformat/flvenc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/flvenc.c b/libavformat/flvenc.c index a1bda11ae7..1c2077b0b5 100644 --- a/libavformat/flvenc.c +++ b/libavformat/flvenc.c @@ -459,8 +459,8 @@ static int flv_write_packet(AVFormatContext *s, AVPacket *pkt) uint8_t *data = NULL; int flags = -1, flags_size, ret; - if (enc->codec_id == AV_CODEC_ID_VP6F || - enc->codec_id == AV_CODEC_ID_VP6A || enc->codec_id == AV_CODEC_ID_AAC) + if (enc->codec_id == AV_CODEC_ID_VP6F || enc->codec_id == AV_CODEC_ID_VP6A || + enc->codec_id == AV_CODEC_ID_AAC) flags_size = 2; else if (enc->codec_id == AV_CODEC_ID_H264 || enc->codec_id == AV_CODEC_ID_MPEG4) flags_size = 5; |