diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-04 02:56:29 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-04 02:56:29 +0100 |
| commit | fb17f03dadc3e344e3d996d7ea0f09e340fdd05b (patch) | |
| tree | 92843c3413846672b90e2b94c768ec926ec4202f /libavresample/avresample.h | |
| parent | ad5e4e0f947ab686325fc7783afd18cd9cd88dc4 (diff) | |
| parent | aec25b1c4650944d32706bfd40eb02bbd5587303 (diff) | |
| download | ffmpeg-fb17f03dadc3e344e3d996d7ea0f09e340fdd05b.tar.gz | |
Merge commit 'aec25b1c4650944d32706bfd40eb02bbd5587303'
* commit 'aec25b1c4650944d32706bfd40eb02bbd5587303':
mpegvideo: split the encoding-only parts of frame_start() into a separate function
Conflicts:
libavcodec/mpegvideo.c
libavcodec/mpegvideo_enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavresample/avresample.h')
0 files changed, 0 insertions, 0 deletions