Merge commit '9df889a5f116c1ee78c2f239e0ba599c492431aa'
authorClément Bœsch <u@pkh.me>
Fri, 29 Jul 2016 09:01:36 +0000 (11:01 +0200)
committerClément Bœsch <u@pkh.me>
Fri, 29 Jul 2016 09:01:36 +0000 (11:01 +0200)
commit15b26e88cb7c775e0e7a422ab6b088b5690f31ad
treea5e2705a74a0ef8f98b51d364fb510169cc7607e
parent7dda97fb86ff615e6a892052545d955816bb58f6
parent9df889a5f116c1ee78c2f239e0ba599c492431aa
Merge commit '9df889a5f116c1ee78c2f239e0ba599c492431aa'

* commit '9df889a5f116c1ee78c2f239e0ba599c492431aa':
  h264: rename h264.[ch] to h264dec.[ch]

Merged-by: Clément Bœsch <u@pkh.me>
39 files changed:
libavcodec/Makefile
libavcodec/crystalhd.c
libavcodec/dxva2_h264.c
libavcodec/h264_cabac.c
libavcodec/h264_cavlc.c
libavcodec/h264_direct.c
libavcodec/h264_loopfilter.c
libavcodec/h264_mb.c
libavcodec/h264_mc_template.c
libavcodec/h264_mvpred.h
libavcodec/h264_parse.c
libavcodec/h264_parser.c
libavcodec/h264_picture.c
libavcodec/h264_ps.c
libavcodec/h264_refs.c
libavcodec/h264_sei.c
libavcodec/h264_slice.c
libavcodec/h264data.c
libavcodec/h264data.h
libavcodec/h264dec.c
libavcodec/h264dec.h
libavcodec/h264idct_template.c
libavcodec/mediacodecdec_h264.c
libavcodec/mips/h264chroma_mips.h
libavcodec/mips/h264dsp_mips.h
libavcodec/omx.c
libavcodec/ppc/h264dsp.c
libavcodec/qsvenc_h264.c
libavcodec/svq3.c
libavcodec/vaapi_encode_h264.c
libavcodec/vaapi_h264.c
libavcodec/vda_h264.c
libavcodec/vda_h264_dec.c
libavcodec/vdpau.c
libavcodec/vdpau_compat.h
libavcodec/vdpau_h264.c
libavcodec/videotoolbox.c
libavcodec/x86/h264_qpel.c
libavformat/mxfenc.c