diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-19 20:39:04 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-19 20:39:04 +0100 |
| commit | 560eb7179a7c46ba277c9c120840816869a47a70 (patch) | |
| tree | f2b3b551efdfad47ee5209968fa79f0d882092d3 /libavresample/aarch64/audio_convert_init.c | |
| parent | e3755119fae71c9e34b630679c2805fcf1c97e2c (diff) | |
| parent | 31d2039cb42668ebcf08248bc48bbad44aa05f49 (diff) | |
| download | ffmpeg-560eb7179a7c46ba277c9c120840816869a47a70.tar.gz | |
Merge commit '31d2039cb42668ebcf08248bc48bbad44aa05f49'
* commit '31d2039cb42668ebcf08248bc48bbad44aa05f49':
h264_parser: export video format and dimensions
Conflicts:
libavcodec/h264_parser.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavresample/aarch64/audio_convert_init.c')
0 files changed, 0 insertions, 0 deletions