diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-11 22:29:40 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-11 22:30:49 +0200 |
| commit | 67911cc57bbe2958fe62ca092b0e43438cd0ba52 (patch) | |
| tree | 873398d40e59e3d2cf6b895ecadcc24d6c388a6a /tools | |
| parent | 67d29da4bd23057a1f646568442a77b844cb2d1b (diff) | |
| parent | 0ddc53dabbc6f636d062b187ea27934610aaad30 (diff) | |
| download | ffmpeg-67911cc57bbe2958fe62ca092b0e43438cd0ba52.tar.gz | |
Merge commit '0ddc53dabbc6f636d062b187ea27934610aaad30'
* commit '0ddc53dabbc6f636d062b187ea27934610aaad30':
mpegvideo: synchronize AVFrame pointers in ERContext fully
Conflicts:
libavcodec/mpegvideo.c
See: 8ef9dcf1d74aea55bf39f1e479fe67e98d973954
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tools')
0 files changed, 0 insertions, 0 deletions