Merge commit '632ad2248e2e5d8cd4b51e6c87c943a38c3da425'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 11 May 2014 19:48:32 +0000 (21:48 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 11 May 2014 19:48:32 +0000 (21:48 +0200)
commitd93cf093f840b9a28481c73d7e421f469f2ca4e7
tree6159a41d2f67277f41953dd72ae349c3e2670155
parent5e95551199871e5912c7bd498cbcc502d33113aa
parent632ad2248e2e5d8cd4b51e6c87c943a38c3da425
Merge commit '632ad2248e2e5d8cd4b51e6c87c943a38c3da425'

* commit '632ad2248e2e5d8cd4b51e6c87c943a38c3da425':
  lavc: Add an internal wrapper around get_format()

Conflicts:
libavcodec/h264_slice.c
libavcodec/mpeg12dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/8bps.c
libavcodec/h263dec.c
libavcodec/internal.h
libavcodec/pthread_frame.c
libavcodec/utils.c
libavcodec/vc1dec.c