diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-12 12:18:31 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-12 12:18:31 +0100 |
| commit | 36685c3c4b03ebe8b5ad6e4ecb1b0227cbe50643 (patch) | |
| tree | c73cdd599f001b88d5cb38f2a724b9455661ac73 /libavutil/file.h | |
| parent | 64d11cb615a9d6591836bf87e76f8ee543467ded (diff) | |
| parent | 15ec0450b4ae891f3e6ababa03c777a4443b94ca (diff) | |
| download | ffmpeg-streaming-36685c3c4b03ebe8b5ad6e4ecb1b0227cbe50643.zip ffmpeg-streaming-36685c3c4b03ebe8b5ad6e4ecb1b0227cbe50643.tar.gz | |
Merge commit '15ec0450b4ae891f3e6ababa03c777a4443b94ca'
* commit '15ec0450b4ae891f3e6ababa03c777a4443b94ca':
lavc: allow decoders to override frame parameters.
Conflicts:
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/file.h')
0 files changed, 0 insertions, 0 deletions
