diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-06 16:15:03 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-06 16:17:38 +0100 |
commit | 7ee8a1c562e8de3bf9627ff10bfb744392c018b7 (patch) | |
tree | ec9d423cfaf4e78f268333ec213d0b784cf7d9bc /libavcodec/dcadata.h | |
parent | a4f8a5649561906ccad7f15247f033e7b8df4a4e (diff) | |
parent | 9a026c72982faf20e1c8dfbe48f0b312cdea69c8 (diff) | |
download | ffmpeg-7ee8a1c562e8de3bf9627ff10bfb744392c018b7.tar.gz |
Merge commit '9a026c72982faf20e1c8dfbe48f0b312cdea69c8'
* commit '9a026c72982faf20e1c8dfbe48f0b312cdea69c8':
h264: rebuild the default ref list if the reference count changes
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dcadata.h')
0 files changed, 0 insertions, 0 deletions