Merge commit 'be1e1373d267bae2af8a62d79eef736736f24565'

* commit 'be1e1373d267bae2af8a62d79eef736736f24565':
  flvenc: Support muxing VP6A as well

Conflicts:
	libavformat/flvenc.c

See: 42ae83c196d5747e8a87772a50a02a7b3f2855c3
Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc libavformat/flvenc.c
index a1bda11,086c5a3..1c2077b
--- 1/libavformat/flvenc.c
--- 2/libavformat/flvenc.c
+++ b/libavformat/flvenc.c
@@@ -457,12 -435,12 +457,12 @@@ static int flv_write_packet(AVFormatCon
      unsigned ts;
      int size = pkt->size;
      uint8_t *data = NULL;
 -    int flags = 0, flags_size;
 +    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)
 +    else if (enc->codec_id == AV_CODEC_ID_H264 || enc->codec_id == AV_CODEC_ID_MPEG4)
          flags_size = 5;
      else
          flags_size = 1;