diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-17 20:59:51 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-17 20:59:51 +0100 |
| commit | 27f55beba2bf9c94996660556543dce1b3ed04b1 (patch) | |
| tree | 03c467d651b1288e225c3a6922e967ae1a420493 /libavformat/hls.c | |
| parent | d42ec8433c687fcbccefa51a7716d81920218e4f (diff) | |
| parent | 614b9e4db8f3d7c23fc0410fc04745a727a82f4e (diff) | |
| download | ffmpeg-27f55beba2bf9c94996660556543dce1b3ed04b1.tar.gz | |
Merge commit '614b9e4db8f3d7c23fc0410fc04745a727a82f4e'
* commit '614b9e4db8f3d7c23fc0410fc04745a727a82f4e':
h264: use avpriv_request_sample for chroma_format_idc
Conflicts:
libavcodec/h264_ps.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/hls.c')
0 files changed, 0 insertions, 0 deletions