diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-30 13:10:33 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-30 13:21:49 +0200 |
| commit | 490ed7f0eccfeba0685ac3148ef9047fd4d92de3 (patch) | |
| tree | ba04d8ff5822dbb49e37175cd953f21501572d67 /ffserver.c | |
| parent | 97947d9bba51bb3936a7907fde20c3b242c0d218 (diff) | |
| parent | d4a217a408da4bd63acc02cd8f9ebe378a2ad65a (diff) | |
| download | ffmpeg-490ed7f0eccfeba0685ac3148ef9047fd4d92de3.tar.gz | |
Merge commit 'd4a217a408da4bd63acc02cd8f9ebe378a2ad65a'
* commit 'd4a217a408da4bd63acc02cd8f9ebe378a2ad65a':
wmapro: check the min_samples_per_subframe
Conflicts:
libavcodec/wmaprodec.c
See: 9166f483c52e7e0a031a7bb149bea16aaa72f344
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffserver.c')
0 files changed, 0 insertions, 0 deletions