diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-27 12:23:53 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-27 12:27:01 +0200 |
| commit | c2ef844aa74c56b72a135fb389e346845ed7be50 (patch) | |
| tree | 1ae29afaba4d1a9e8cf1b63dbd7670ebabfc9648 /libavcodec/h264.c | |
| parent | c437765be7628c9dacb64aa1c1c46c0c39df1ca9 (diff) | |
| parent | 541427ab4d5b4b6f5a90a687a06decdb78e7bc3c (diff) | |
| download | ffmpeg-c2ef844aa74c56b72a135fb389e346845ed7be50.tar.gz | |
Merge commit '541427ab4d5b4b6f5a90a687a06decdb78e7bc3c'
* commit '541427ab4d5b4b6f5a90a687a06decdb78e7bc3c':
eamad: use the bytestream2 API instead of AV_RL
Conflicts:
libavcodec/eamad.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264.c')
0 files changed, 0 insertions, 0 deletions