diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-02 12:10:52 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-02 12:10:52 +0100 |
| commit | 547042a8cd0f425263a4f96603debe8b4fab1b93 (patch) | |
| tree | 07ccaad536ba426f0c28ebf5de954ceecb64f433 /libavcodec/roqvideo.h | |
| parent | 2d2e6db7cfe5d50fb428a03f7c6450e7248d0a36 (diff) | |
| parent | 437211ae73ef1ed8285b4fed7620502ea4999e11 (diff) | |
| download | ffmpeg-547042a8cd0f425263a4f96603debe8b4fab1b93.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
h264: set ref_count to 0 for intra slices.
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/roqvideo.h')
0 files changed, 0 insertions, 0 deletions