Merge commit '7ecc2d403ce5c7b6ea3b1f368dccefd105209c7e'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 8 Mar 2013 19:18:45 +0000 (20:18 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 8 Mar 2013 19:33:26 +0000 (20:33 +0100)
commitc4e8821732999f720535bb2eb1e8c7f1ea1db18f
tree12b31863b7145b0342207aafd0ffa256da2904b9
parentfee484edaff77fc831d4cbbdd259ea0948103f86
parent7ecc2d403ce5c7b6ea3b1f368dccefd105209c7e
Merge commit '7ecc2d403ce5c7b6ea3b1f368dccefd105209c7e'

* commit '7ecc2d403ce5c7b6ea3b1f368dccefd105209c7e':
  Move AVFrame from lavc to lavu.

Conflicts:
libavcodec/avcodec.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/avcodec.h
libavcodec/internal.h
libavcodec/tiff.c
libavcodec/utils.c
libavutil/Makefile
libavutil/frame.c
libavutil/frame.h