diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-06 02:37:51 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-06 02:48:09 +0100 |
| commit | 26c2e3bf1a7127fd2e19f23cbfa29c3f999ecdb9 (patch) | |
| tree | 02c898cbb6e65179bf3894e72fe4b665f095799a /tests/ref/lavf/w64 | |
| parent | d5050bae801ff789c188d9e426dae6018a5f709f (diff) | |
| parent | 381a722562bcc0b623acf6a00a583fe989bcb72a (diff) | |
| download | ffmpeg-26c2e3bf1a7127fd2e19f23cbfa29c3f999ecdb9.tar.gz | |
Merge commit '381a722562bcc0b623acf6a00a583fe989bcb72a'
* commit '381a722562bcc0b623acf6a00a583fe989bcb72a':
mpegvideo: split the encoding-only parts of ff_MPV_frame_end() into a separate function
Conflicts:
libavcodec/mpegvideo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/ref/lavf/w64')
0 files changed, 0 insertions, 0 deletions