diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-14 15:36:37 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-14 15:36:37 +0100 |
| commit | 2f265d9087362c17920e4bce59b21653f3fffbfe (patch) | |
| tree | 209ef39243b60e4f360646fd211d88e15f913418 /libavutil/opt.h | |
| parent | 86b4dc6277691781015000763563d1baf212cdc7 (diff) | |
| parent | 6a27ae28f9bde981e85c82cf5bf42c5f43fb6f13 (diff) | |
| download | ffmpeg-2f265d9087362c17920e4bce59b21653f3fffbfe.tar.gz | |
Merge commit '6a27ae28f9bde981e85c82cf5bf42c5f43fb6f13'
* commit '6a27ae28f9bde981e85c82cf5bf42c5f43fb6f13':
mpegvideo: treat delayed pictures as used
Conflicts:
libavcodec/h264.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/opt.h')
0 files changed, 0 insertions, 0 deletions