1. 29 Jul, 2015 8 commits
  2. 28 Jul, 2015 20 commits
  3. 27 Jul, 2015 12 commits
    • Michael Niedermayer's avatar
      avcodec/mpegvideo_enc: move ff_side_data_set_encoder_stats() call to after the vbv retry code · 360cebc9
      Michael Niedermayer authored
      This ensures the data matches the final values
      Signed-off-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
      360cebc9
    • Michael Niedermayer's avatar
      Merge commit 'b7040e67' · ea7e4f8e
      Michael Niedermayer authored
      * commit 'b7040e67':
        h264: fix AVDISCARD_NONKEY for some interlaced content
      
      Conflicts:
      	libavcodec/h264.c
      
      Not merged, the used field is not initialized where it is used
      Merged-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
      ea7e4f8e
    • Michael Niedermayer's avatar
      Merge commit 'b5c1c162' · e1296b5f
      Michael Niedermayer authored
      * commit 'b5c1c162':
        asfdec: do not align Data Object when Broadcast Flag is set
      Merged-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
      e1296b5f
    • Michael Niedermayer's avatar
      Merge commit 'db21dde3' · 4ecc9a2f
      Michael Niedermayer authored
      * commit 'db21dde3':
        qsvdec_mpeg2: drop an incorrect comment
      
      Conflicts:
      	libavcodec/qsvdec_mpeg2.c
      
      No change as the removed comment was not in libavcodec/qsvdec_mpeg2.c
      Merged-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
      4ecc9a2f
    • Michael Niedermayer's avatar
      Merge commit 'abdc7e40' · 14673048
      Michael Niedermayer authored
      * commit 'abdc7e40':
        fate: Add hap-chunk ref file
      
      Conflicts:
      	tests/ref/fate/hap-chunk
      
      See: c7e64434Merged-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
      14673048
    • Michael Niedermayer's avatar
      Merge commit 'aaf937ee' · 952e9fbb
      Michael Niedermayer authored
      * commit 'aaf937ee':
        hap: Add utility functions file
      
      Conflicts:
      	libavcodec/hap.c
      
      No change, no files are/where missing in FFmpeg
      Merged-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
      952e9fbb
    • Michael Niedermayer's avatar
      Merge commit '3ee21785' · 4be1b6be
      Michael Niedermayer authored
      * commit '3ee21785':
        Support the Hap chunked frame format
      
      Conflicts:
      	libavcodec/hap.h
      	libavcodec/hapdec.c
      	libavcodec/version.h
      
      See: c7e64434Merged-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
      4be1b6be
    • Michael Niedermayer's avatar
      Merge commit '43dd0047' · f01e3c5d
      Michael Niedermayer authored
      * commit '43dd0047':
        hap: Move some per-stream setup into decoder init rather than per-frame
      
      Conflicts:
      	libavcodec/hapdec.c
      
      See: 6074956fMerged-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
      f01e3c5d
    • Michael Niedermayer's avatar
      Merge commit 'b94ec304' · e3ec2cde
      Michael Niedermayer authored
      * commit 'b94ec304':
        lavc: Update version and APIchanges
      
      Conflicts:
      	doc/APIchanges
      	libavcodec/avcodec.h
      	libavcodec/version.h
      Merged-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
      e3ec2cde
    • Michael Niedermayer's avatar
      Merge commit '059a9348' · 29d147c9
      Michael Niedermayer authored
      * commit '059a9348':
        lavc: Consistently prefix input buffer defines
      
      Conflicts:
      	doc/examples/decoding_encoding.c
      	libavcodec/4xm.c
      	libavcodec/aac_adtstoasc_bsf.c
      	libavcodec/aacdec.c
      	libavcodec/aacenc.c
      	libavcodec/ac3dec.h
      	libavcodec/asvenc.c
      	libavcodec/avcodec.h
      	libavcodec/avpacket.c
      	libavcodec/dvdec.c
      	libavcodec/ffv1enc.c
      	libavcodec/g2meet.c
      	libavcodec/gif.c
      	libavcodec/h264.c
      	libavcodec/h264_mp4toannexb_bsf.c
      	libavcodec/huffyuvdec.c
      	libavcodec/huffyuvenc.c
      	libavcodec/jpeglsenc.c
      	libavcodec/libxvid.c
      	libavcodec/mdec.c
      	libavcodec/motionpixels.c
      	libavcodec/mpeg4videodec.c
      	libavcodec/mpegvideo.c
      	libavcodec/noise_bsf.c
      	libavcodec/nuv.c
      	libavcodec/nvenc.c
      	libavcodec/options.c
      	libavcodec/parser.c
      	libavcodec/pngenc.c
      	libavcodec/proresenc_kostya.c
      	libavcodec/qsvdec.c
      	libavcodec/svq1enc.c
      	libavcodec/tiffenc.c
      	libavcodec/truemotion2.c
      	libavcodec/utils.c
      	libavcodec/utvideoenc.c
      	libavcodec/vc1dec.c
      	libavcodec/wmalosslessdec.c
      	libavformat/adxdec.c
      	libavformat/aiffdec.c
      	libavformat/apc.c
      	libavformat/apetag.c
      	libavformat/avidec.c
      	libavformat/bink.c
      	libavformat/cafdec.c
      	libavformat/flvdec.c
      	libavformat/id3v2.c
      	libavformat/isom.c
      	libavformat/matroskadec.c
      	libavformat/mov.c
      	libavformat/mpc.c
      	libavformat/mpc8.c
      	libavformat/mpegts.c
      	libavformat/mvi.c
      	libavformat/mxfdec.c
      	libavformat/mxg.c
      	libavformat/nutdec.c
      	libavformat/oggdec.c
      	libavformat/oggparsecelt.c
      	libavformat/oggparseflac.c
      	libavformat/oggparseopus.c
      	libavformat/oggparsespeex.c
      	libavformat/omadec.c
      	libavformat/rawdec.c
      	libavformat/riffdec.c
      	libavformat/rl2.c
      	libavformat/rmdec.c
      	libavformat/rtpdec_latm.c
      	libavformat/rtpdec_mpeg4.c
      	libavformat/rtpdec_qdm2.c
      	libavformat/rtpdec_svq3.c
      	libavformat/sierravmd.c
      	libavformat/smacker.c
      	libavformat/smush.c
      	libavformat/spdifenc.c
      	libavformat/takdec.c
      	libavformat/tta.c
      	libavformat/utils.c
      	libavformat/vqf.c
      	libavformat/westwood_vqa.c
      	libavformat/xmv.c
      	libavformat/xwma.c
      	libavformat/yop.c
      Merged-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
      29d147c9
    • Michael Niedermayer's avatar
      Merge commit 'def97856' · 444e9874
      Michael Niedermayer authored
      * commit 'def97856':
        lavc: AV-prefix all codec capabilities
      
      Conflicts:
      	cmdutils.c
      	ffmpeg.c
      	ffplay.c
      	libavcodec/8svx.c
      	libavcodec/aacenc.c
      	libavcodec/ac3dec.c
      	libavcodec/adpcm.c
      	libavcodec/alac.c
      	libavcodec/atrac3plusdec.c
      	libavcodec/bink.c
      	libavcodec/dnxhddec.c
      	libavcodec/dvdec.c
      	libavcodec/dvenc.c
      	libavcodec/ffv1dec.c
      	libavcodec/ffv1enc.c
      	libavcodec/fic.c
      	libavcodec/flacdec.c
      	libavcodec/flacenc.c
      	libavcodec/flvdec.c
      	libavcodec/fraps.c
      	libavcodec/frwu.c
      	libavcodec/gifdec.c
      	libavcodec/h261dec.c
      	libavcodec/hevc.c
      	libavcodec/iff.c
      	libavcodec/imc.c
      	libavcodec/libopenjpegdec.c
      	libavcodec/libvo-aacenc.c
      	libavcodec/libvorbisenc.c
      	libavcodec/libvpxdec.c
      	libavcodec/libvpxenc.c
      	libavcodec/libx264.c
      	libavcodec/mjpegbdec.c
      	libavcodec/mjpegdec.c
      	libavcodec/mpegaudiodec_float.c
      	libavcodec/msmpeg4dec.c
      	libavcodec/mxpegdec.c
      	libavcodec/nvenc_h264.c
      	libavcodec/nvenc_hevc.c
      	libavcodec/pngdec.c
      	libavcodec/qpeg.c
      	libavcodec/ra288.c
      	libavcodec/rv10.c
      	libavcodec/s302m.c
      	libavcodec/sp5xdec.c
      	libavcodec/takdec.c
      	libavcodec/tiff.c
      	libavcodec/tta.c
      	libavcodec/utils.c
      	libavcodec/v210dec.c
      	libavcodec/vp6.c
      	libavcodec/vp9.c
      	libavcodec/wavpack.c
      	libavcodec/yop.c
      Merged-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
      444e9874
    • Michael Niedermayer's avatar
      Merge commit '7c6eb0a1' · 94d68a41
      Michael Niedermayer authored
      * commit '7c6eb0a1':
        lavc: AV-prefix all codec flags
      
      Conflicts:
      	doc/examples/muxing.c
      	ffmpeg.c
      	ffmpeg_opt.c
      	ffplay.c
      	libavcodec/aacdec.c
      	libavcodec/aacenc.c
      	libavcodec/ac3dec.c
      	libavcodec/ac3enc_float.c
      	libavcodec/atrac1.c
      	libavcodec/atrac3.c
      	libavcodec/atrac3plusdec.c
      	libavcodec/dcadec.c
      	libavcodec/ffv1enc.c
      	libavcodec/h264.c
      	libavcodec/h264_loopfilter.c
      	libavcodec/h264_mb.c
      	libavcodec/imc.c
      	libavcodec/libmp3lame.c
      	libavcodec/libtheoraenc.c
      	libavcodec/libtwolame.c
      	libavcodec/libvpxenc.c
      	libavcodec/libxavs.c
      	libavcodec/libxvid.c
      	libavcodec/mpeg12dec.c
      	libavcodec/mpeg12enc.c
      	libavcodec/mpegaudiodec_template.c
      	libavcodec/mpegvideo.c
      	libavcodec/mpegvideo_enc.c
      	libavcodec/mpegvideo_motion.c
      	libavcodec/nellymoserdec.c
      	libavcodec/nellymoserenc.c
      	libavcodec/nvenc.c
      	libavcodec/on2avc.c
      	libavcodec/options_table.h
      	libavcodec/opus_celt.c
      	libavcodec/pngenc.c
      	libavcodec/ra288.c
      	libavcodec/ratecontrol.c
      	libavcodec/twinvq.c
      	libavcodec/vc1_block.c
      	libavcodec/vc1_loopfilter.c
      	libavcodec/vc1_mc.c
      	libavcodec/vc1dec.c
      	libavcodec/vorbisdec.c
      	libavcodec/vp3.c
      	libavcodec/wma.c
      	libavcodec/wmaprodec.c
      	libavcodec/x86/hpeldsp_init.c
      	libavcodec/x86/me_cmp_init.c
      Merged-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
      94d68a41