Merge commit '8feac29cc46270cc89d6016340e7bac780877131'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 24 Feb 2014 09:15:16 +0000 (10:15 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 24 Feb 2014 09:15:19 +0000 (10:15 +0100)
commit7a9946d386a3736abde0d7584bef526dc779a36f
tree0c95382aac1138e1f635f983f2d385882b734168
parent74bb1ca82c3bf604e460f581d9ac9dbe2af19448
parent8feac29cc46270cc89d6016340e7bac780877131
Merge commit '8feac29cc46270cc89d6016340e7bac780877131'

* commit '8feac29cc46270cc89d6016340e7bac780877131':
  lavc: use AVFrame API properly in ff_reget_buffer()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/utils.c