diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-10 20:40:18 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-10 20:41:36 +0200 |
| commit | 88679aeb08b9b29613d283eb5ad29abbabd5a9e9 (patch) | |
| tree | df52e9a141bb7d8c525f6569616dcf738fc065e2 /libavcodec/assenc.c | |
| parent | 049161fb7c66560ac42c91f2affb6c50d794afcc (diff) | |
| parent | 7061bf0925a7d6c5899bbe710b2b8cdae9005274 (diff) | |
| download | ffmpeg-88679aeb08b9b29613d283eb5ad29abbabd5a9e9.tar.gz | |
Merge commit '7061bf0925a7d6c5899bbe710b2b8cdae9005274'
* commit '7061bf0925a7d6c5899bbe710b2b8cdae9005274':
mpegvideo: Move Picture-related functions to a separate file
Conflicts:
libavcodec/mpegvideo.c
libavcodec/mpegvideo.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/assenc.c')
0 files changed, 0 insertions, 0 deletions