diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-08 13:51:59 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-08 13:55:06 +0200 |
| commit | c074feed292eb1d9371aaa3c63136d4cb241f8c5 (patch) | |
| tree | 83b56ed20f6c47ab39fd380ee4c9abf1b0cb301a /cmdutils.c | |
| parent | 53c3abc1083d630cb50427e09783cf6ce84d4a45 (diff) | |
| parent | e8ff7972064631afbdf240ec6bfd9dec30cf2ce8 (diff) | |
| download | ffmpeg-c074feed292eb1d9371aaa3c63136d4cb241f8c5.tar.gz | |
Merge commit 'e8ff7972064631afbdf240ec6bfd9dec30cf2ce8' into release/1.1
* commit 'e8ff7972064631afbdf240ec6bfd9dec30cf2ce8':
eamad: use the bytestream2 API instead of AV_RL
Conflicts:
libavcodec/eamad.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'cmdutils.c')
0 files changed, 0 insertions, 0 deletions