diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-03 02:32:51 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-03 02:32:58 +0200 |
| commit | 18b233428a9899d3c725d1168a94898c508b35b5 (patch) | |
| tree | af2821a7d53e918123285e8ab127ba92082b3b00 /libswscale/swscale.c | |
| parent | c437ab3c4ea2578e68e39e4bf32dda2ff6a1ed07 (diff) | |
| parent | 079758e49a4d6b3e7cf2e22bed71d34c46712242 (diff) | |
| download | ffmpeg-18b233428a9899d3c725d1168a94898c508b35b5.tar.gz | |
Merge commit '079758e49a4d6b3e7cf2e22bed71d34c46712242' into release/0.10
* commit '079758e49a4d6b3e7cf2e22bed71d34c46712242':
h264: reset next_output_pic earlier in start_frame()
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale/swscale.c')
0 files changed, 0 insertions, 0 deletions