Merge commit 'e671d3ad6cd7fe1d02e9b35b889a25d8c059fce9'

* commit 'e671d3ad6cd7fe1d02e9b35b889a25d8c059fce9':
  h264: do not copy ref count/ref2frm when updating per-frame context
  flvdec: Check the return value of a malloc

Conflicts:
	libavformat/flvdec.c

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

diff --cc libavcodec/h264.c
Simple merge

diff --cc libavformat/flvdec.c
index 482e876,403a9b5..d0511f1
--- 1/libavformat/flvdec.c
--- 2/libavformat/flvdec.c
+++ b/libavformat/flvdec.c
@@@ -212,10 -213,14 +212,14 @@@ static int flv_set_video_codec(AVFormat
                  vcodec->codec_id = AV_CODEC_ID_VP6A;
              if (read) {
                  if (vcodec->extradata_size != 1) {
-                     vcodec->extradata_size = 1;
 -                    vcodec->extradata = av_malloc(1);
 +                    vcodec->extradata = av_malloc(1 + FF_INPUT_BUFFER_PADDING_SIZE);
+                     if (vcodec->extradata)
+                         vcodec->extradata_size = 1;
                  }
-                 vcodec->extradata[0] = avio_r8(s->pb);
+                 if (vcodec->extradata)
+                     vcodec->extradata[0] = avio_r8(s->pb);
+                 else
+                     avio_skip(s->pb, 1);
              }
              return 1; // 1 byte body size adjustment for flv_read_packet()
          case FLV_CODECID_H264: