diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-05 00:22:05 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-05 00:42:47 +0200 |
| commit | b6850e132f36f5e467b949c36666787b4c2f1331 (patch) | |
| tree | 967500c7bc8ca946ede101e274a742d1e83a2de3 /libavcodec/h264pred.c | |
| parent | 37af48717067a2080d7f8cf186011251b17c9529 (diff) | |
| parent | 9c21c08fa7c5d0c8391c8b6f47c61a8d4d9f040d (diff) | |
| download | ffmpeg-b6850e132f36f5e467b949c36666787b4c2f1331.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
af_ashowinfo: print a more descriptive name for AV_MATRIX_ENCODING_DOLBY
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264pred.c')
0 files changed, 0 insertions, 0 deletions