diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-15 19:24:19 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-15 19:24:19 +0200 |
| commit | f478e8500a3d1fb0c6014956de42d87e292b9e3b (patch) | |
| tree | 87becafb3f58cad48a56e43f173f346bb01e8c69 /libavcodec/bfin | |
| parent | eacf7d650dfe6e97d6100a232fa6a89592b625b5 (diff) | |
| parent | c9281a01b78cc3f09e36300a0ca3f5824d1c74cf (diff) | |
| download | ffmpeg-f478e8500a3d1fb0c6014956de42d87e292b9e3b.tar.gz | |
Merge commit 'c9281a01b78cc3f09e36300a0ca3f5824d1c74cf'
* commit 'c9281a01b78cc3f09e36300a0ca3f5824d1c74cf':
lavf: drop the zero-sized packets hack
Conflicts:
libavformat/mux.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/bfin')
0 files changed, 0 insertions, 0 deletions