Merge commit '37a749012aaacc801fe860428417a6d7b81c103f'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 9 Dec 2013 17:58:41 +0000 (18:58 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 9 Dec 2013 18:37:53 +0000 (19:37 +0100)
commit7a901eb33af6a079d0ce4045c64eda858884f861
tree8866db461e8256270efc602429f4a79265272f51
parent58f70f17017ec586a50f1fea4a744cbd11f74796
parent37a749012aaacc801fe860428417a6d7b81c103f
Merge commit '37a749012aaacc801fe860428417a6d7b81c103f'

* commit '37a749012aaacc801fe860428417a6d7b81c103f':
  lavc: rework handling of refcounted_frames=0

Conflicts:
libavcodec/utils.c

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