diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-24 01:24:55 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-24 01:33:02 +0100 |
| commit | ffd77f94a26be22b8ead3178ceec3ed39e68abc5 (patch) | |
| tree | 0e7982c66986de2d8aa41102610a87866e042bec /libavdevice/alsa-audio-enc.c | |
| parent | 0626211b561f299971a96b7bd1ee6f8a6d6735c8 (diff) | |
| parent | f51d0f39c0fb3470d6b186974109428da91f1d1b (diff) | |
| download | ffmpeg-ffd77f94a26be22b8ead3178ceec3ed39e68abc5.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
h264: Split h264 slice decoding from nal decoding
Conflicts:
libavcodec/Makefile
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice/alsa-audio-enc.c')
0 files changed, 0 insertions, 0 deletions