diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-04 01:20:46 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-04 01:20:46 +0100 |
| commit | 1a4ffa5b136a112935e7db19eb49e6042c6d5143 (patch) | |
| tree | ebacb4ce290422cfe893bc96180d961fa7b7a43f /libavcodec/vda_h264_dec.c | |
| parent | 3220a894f794607efab96ec3837e4c64f19f75ea (diff) | |
| parent | 8b63ebcb038683a6a772d0e9d9518b60bbd9a22f (diff) | |
| download | ffmpeg-1a4ffa5b136a112935e7db19eb49e6042c6d5143.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
build: Remove redundant OBJS declaration intended for programs
Conflicts:
Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vda_h264_dec.c')
0 files changed, 0 insertions, 0 deletions