Merge commit 'fb0c9d41d685abb58575c5482ca33b8cd457c5ec'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 26 Jan 2014 00:39:33 +0000 (01:39 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 26 Jan 2014 00:54:55 +0000 (01:54 +0100)
commit965fa6b0d9d99afbbef8b3fcb8066ce4136b8c35
tree1c00ee6a0981502047f9c0a3e53ec79a7af900b9
parent53167ecfdb99151c1f0d243275675a75efb881a7
parentfb0c9d41d685abb58575c5482ca33b8cd457c5ec
Merge commit 'fb0c9d41d685abb58575c5482ca33b8cd457c5ec'

* commit 'fb0c9d41d685abb58575c5482ca33b8cd457c5ec':
  avutil: remove timer.h include from internal.h

Conflicts:
libavcodec/ffv1dec.c
libavutil/internal.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 files changed:
libavcodec/cabac.c
libavcodec/dnxhddec.c
libavcodec/dnxhdenc.c
libavcodec/h264.c
libavcodec/h264_cabac.c
libavcodec/ivi_common.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo_enc.c
libavutil/aes.c
libavutil/base64.c
libavutil/eval.c
libavutil/internal.h